From: opensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 6 Apr 2009 17:38:16 +0000 (+0000)
Subject: - Updating locales for 2.5.18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2c3b5ac3d2a225a04e65c05c03b1ba9c64edd2e1;p=gosa.git

- Updating locales for 2.5.18



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

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 6e28188a0..518735d88 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2008-02-21 11:16+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -177,7 +177,7 @@ msgstr "Referenzen"
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -205,6 +205,7 @@ msgstr "Geräte"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Information"
 
@@ -1619,6 +1620,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Aus"
 
@@ -1730,6 +1733,7 @@ msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "An"
 
@@ -2231,7 +2235,10 @@ msgstr "Zustellungs-Methode"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "deaktiviert"
 
@@ -3434,7 +3441,7 @@ msgstr "Benötige"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Beenden"
 
@@ -3442,7 +3449,7 @@ msgstr "Beenden"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
@@ -3580,7 +3587,7 @@ msgstr "Vollständige Adresse"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "Standard"
 
@@ -3790,6 +3797,7 @@ msgid "Release interval"
 msgstr "Freigabe-Intervall"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -4048,7 +4056,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -4096,7 +4104,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5211,8 +5219,8 @@ msgstr "Bewahren"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5504,13 +5512,13 @@ msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5561,7 +5569,7 @@ msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6724,7 +6732,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6733,13 +6741,13 @@ msgstr "keine"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
@@ -7330,7 +7338,7 @@ msgstr ""
 "Es sind zu viele Gruppen in der Datenbank. Es kann keine freie ID reserviert "
 "werden!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
@@ -7338,42 +7346,42 @@ msgstr ""
 "Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
 "verfügbar."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "lesen"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "posten"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "extern posten"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "admin"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Dieser 'DN' hat keine Mail-Erweiterungen."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7382,13 +7390,13 @@ msgstr ""
 "Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7397,7 +7405,7 @@ msgstr ""
 "Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
 "Sie auf die untere Schaltfläche klicken."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -7405,13 +7413,13 @@ msgstr ""
 "Diesen verteilten Ordner vom Mail-Server entfernen nachdem der Eintrag aus "
 "dem LDAP entfernt wurde"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Diesen verteilten Ordner samt Inhalt entfernen nachdem dieses Konto "
 "gespeichert wurde"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
@@ -7419,14 +7427,14 @@ msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
 "aufzunehmen."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
 "Sinn."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7436,7 +7444,7 @@ msgid ""
 "addresses."
 msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
@@ -7444,103 +7452,103 @@ msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
 "anderen Benutzer verwendet"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr "nicht definiert"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Mails"
 msgstr "Mails"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Journals"
 msgstr "Journal"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr "Kalender"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "Notes"
 msgstr "Notizen"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr "Gesendete Objekte"
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr "Spam Mail"
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Entfernen der Gruppen-Mail-Einstellungen ist fehlgeschlagen"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Speichern der Mail-Einstellungen für die Gruppe fehlgeschlagen"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Das benötigte Feld 'Primäre Adresse' ist nicht gesetzt."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr ""
 "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "Das Feld 'Kontingent-Größe' enthält einen ungültigen Wert."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Bitte geben Sie eine gültige Größenbeschränkung für Mails an, die abgewiesen "
 "werden sollen."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Bitte wählen sie gültige Zugriffsrechte. Standard-Zugriffsrechte dürfen "
 "nicht leer sein."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
@@ -7566,11 +7574,11 @@ msgstr "Alternative Adressen"
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7622,6 +7630,20 @@ msgstr "Standard-Berechtigungen"
 msgid "Member permission"
 msgstr "Mitglieder-Berechtigungen"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Erweiterte Mail-Einstellungen"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Wählen Sie dies, wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
+"und empfangen darf"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
@@ -8003,65 +8025,65 @@ msgstr "Zeige Adressen des Benutzers"
 msgid "User name of which addresses are shown"
 msgstr "Benutzername, dessen Adressen angezeigt werden"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 msgid "Enable vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 msgid "Vacation start/stop"
 msgstr "Urlaubsanfang/-ende"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Scalix Mailknoten"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "Postfach-Klasse"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Server-Sprache"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Administrator"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "Postfach Administrator"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "Verberge Benutzereintrag in Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "Postfach Größenbeschränkungen"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Ausgehenden Verkehr einschränken"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "Eingehenenden Verkehr einschränken"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Benachrichtige Benutzer"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Scalix Email-Adressen"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr "Neuen Auftrag erstellen/Auftrag bearbeiten"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr "Aufgaben entfernen"
 
@@ -9493,7 +9515,7 @@ msgid "Domain Name Service"
 msgstr "Domänen-Namensdienst"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Domäne"
 
@@ -9863,7 +9885,7 @@ msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 msgid "The required field 'MAC-address' is not set."
 msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9999,6 +10021,8 @@ msgstr "Standard Leasedauer"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -12166,6 +12190,15 @@ msgid "Number of listed windows workstations"
 msgstr "Anzahl der angezeigten Windows-Arbeitsstationen"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "Standard"
 
@@ -12700,21 +12733,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
 
@@ -12974,7 +13007,7 @@ msgstr ""
 "um eine Telefon-Warteschlange zu erstellen."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "Bitte wählen Sie einen gültigen goFonHomeServer."
 
@@ -13001,7 +13034,7 @@ msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -13046,8 +13079,8 @@ msgstr "Die MySQL-Abfrage schlug fehl."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -14201,32 +14234,22 @@ msgstr ""
 "Das Makro kann nicht aus '%s' entfernt werden. Überprüfen Sie die GOsa Log-"
 "Meldungen nach MySQL-Fehlermeldungen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "Mehr als ein '(' wird momentan nicht unterstützt (Zeile: '%s')."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "Mehr als ein ')' wird momentan nicht unterstützt (Zeile: '%s')."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "Es wurde keine Anwendung angegeben (Zeile: '%s')."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "Es wurde keine Erweiterung angegeben (in Zeile '%s')."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Einfügen des neuen Makros auf Server '%s' fehlgeschlagen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
@@ -14234,30 +14257,30 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank definiert sein um "
 "das Makro zu speichern."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Die angegebene cn ist zu lang. Die mögliche Länge ist auf 20 Zeichen "
 "begrenzt."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
@@ -14265,7 +14288,7 @@ msgstr ""
 "Dieses Makro ist noch in Benutzung. Es ist daher erforderlich, dass es als "
 "sichtbar für Benutzer markiert ist."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
@@ -14273,7 +14296,7 @@ msgstr ""
 "Dieses Makro ist in Benutzung. Um es zu entfernen, stellen Sie bitte sicher, "
 "dass niemand dieses Makro ausgewählt hat."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
@@ -14281,15 +14304,15 @@ msgstr ""
 "Kann den Makro-Eintrag nicht aus den Asterisk-Datenbanken entfernen. Bitte "
 "überprüfen Sie Ihre Asterisk-Konfigurationen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Entfernen des Telefon-Markos ist fehlgeschlagen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Entfernen der Referenzen auf Telefon-Makros ist fehlgeschlagen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Speichern des Telefon-Makros ist fehlgeschlagen"
 
@@ -14355,7 +14378,7 @@ msgstr ""
 "ändern."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14510,27 +14533,27 @@ msgstr ""
 "Unterbreche das Speichern der Einträge, um die Konsistenz der Datenbank zu "
 "bewahren. Überprüfen Sie das GOsa Protokoll auf MySQL-Fehler."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Fehler bei der Ausführung der Anfrage:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "Dieses Konto besitzt keine Telefon-Erweiterungen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 "Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14538,12 +14561,12 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14551,7 +14574,7 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "nicht aktivieren, solange keine gültige UID gesetzt ist."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14559,20 +14582,21 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, fuzzy, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 "Bitte geben Sie eine gültige Telefonnumer ein! Aufgrund der 'Realtime "
 "Extension'-Tabellen darf diese Nummer nicht aus mehr als elf Ziffern "
 "bestehen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -14580,11 +14604,11 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank vorhanden sein, "
 "um ein Telefonkonto zu erstellen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Die Voicemail-PIN muss 1-4 Zeichen lang sein."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14592,7 +14616,7 @@ msgstr ""
 "Das Feld 'Voicemail-PIN' enthält ungültige Zeichen. Nur numerische Werte "
 "sind erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14600,16 +14624,16 @@ msgstr ""
 "Das Feld 'PIN' enthält ungültige Zeichen. Nur alphanumerische Werte sind "
 "erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Speichern des Telefon-Kontos ist fehlgeschlagen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14618,12 +14642,12 @@ msgstr ""
 "MySQL-Server '%s' kann nicht als Benutzer '%s' erreicht werden, überprüfen "
 "Sie das GOsa Protokoll auf MySQL-Fehlermeldungen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14631,16 +14655,16 @@ msgstr ""
 "Kann das Telefon-Konto nicht entfernen, die MySQL-Erweiterung ist in der PHP-"
 "Konfiguration nicht vorhanden."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Benutzer '%s' von Warteschlange '%s' entfernt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Entfernen des Telefon-Kontos ist fehlgeschlagen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -15315,18 +15339,18 @@ msgstr "Mobiltelefon"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
 
@@ -15699,6 +15723,7 @@ msgid "hour"
 msgstr "Stunde"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "Stunden"
 
@@ -15887,120 +15912,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Januar"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Februar"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "März"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "April"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Mai"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Juni"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Juli"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "August"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "September"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Oktober"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "November"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "Dezember"
@@ -16119,20 +16144,6 @@ msgstr "in den Ordner"
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen, die größer sind als"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Erweiterte Mail-Einstellungen"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Wählen Sie dies, wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
-"und empfangen darf"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Wähle Abteilung"
@@ -16340,7 +16351,7 @@ msgid "User must change password on first login"
 msgstr "Der Benutzer muss beim ersten Anmelden sein Kennwort ändern"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "Kennwort läuft ab am"
 
@@ -16350,8 +16361,8 @@ msgstr "UNIX-Einstellungen"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -16436,20 +16447,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Zugriffsoptionen"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Kennwort vom Client aus ändern"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Kennwort"
 
@@ -16457,115 +16468,122 @@ msgstr "Die Anmeldung vom Windows-Client erfordert kein Kennwort"
 msgid "Temporary disable samba account"
 msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "zeige Informationen"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "Kopfzeilen"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Spiegeln"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Startprogramm"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Arbeitsverzeichnis"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Verbinden"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "Leerlauf"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Client-Geräte"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Client-Laufwerke beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Client-Drucker beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Standard-Drucker vom Client wählen"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Spiegeln"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "Bei Trennung oder abgelaufenem Zeitlimit"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Limitiere Logon Zeit"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Limitiere Logoff Zeit"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Samba-Anmeldezeiten"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Einstellungen bearbeiten..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto besitzt keine Samba-Erweiterungen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Samba-Konto entfernen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16573,12 +16591,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:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Samba-Konto erstellen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16586,7 +16604,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:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16595,48 +16613,74 @@ msgstr ""
 "aktivieren werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert "
 "werden."
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "trennen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr ""
+"Das Kennwort, welches Sie als 'Neues Kennwort' eingegeben haben, ist zu kurz."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "Der angegebene Kennwort Differenzwert ist nicht numerisch."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Entfernen des Samba-Kontos ist fehlgeschlagen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Bitte wählen Sie einen gültigen goFonHomeServer."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Bitte geben Sie einen Wert für Attribut 'Pfad' an."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, 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:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -16644,7 +16688,7 @@ msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16652,7 +16696,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16660,7 +16704,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16668,10 +16712,146 @@ 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:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Speichern des Samba-Kontos fehlgeschlagen"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Minute"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Vor"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Aus"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Ab"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "setzen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Telefon-Attribute"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Minimale Kennwortlänge"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Kennwort-Speicherung"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Kennwort-Änderung"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "Maximale Leasedauer"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Administrator-Kennwort:"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Ort"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Trennen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "aktiv, Kennwort kann nicht geändert werden"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Skript-Attribute"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Letzte Anmeldung"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Anmelde-Skripte"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Neues Kennwort (Wiederholung)"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Letzte Anmeldung"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Letzte Anmeldung"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatisch"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Kennwort läuft ab am"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Kennwort-Änderung ist nicht erlaubt"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Wählen Sie die hinzuzufügenden Arbeitsstationen"
@@ -16822,49 +17002,49 @@ msgstr "ungültig"
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Speichern des allgemeinen Benutzerkontos fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -16872,7 +17052,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16880,11 +17060,11 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
@@ -16957,11 +17137,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Letzte Anmeldung"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
@@ -18142,6 +18317,18 @@ msgstr "Proxynutzung durch Kontingent einschränken"
 msgid "per"
 msgstr "pro"
 
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr "Mehr als ein '(' wird momentan nicht unterstützt (Zeile: '%s')."
+
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr "Mehr als ein ')' wird momentan nicht unterstützt (Zeile: '%s')."
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Limitiere Logon Zeit"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Limitiere Logoff Zeit"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "Sie versuchen, eine ungültige Mail-Adresse hinzuzufügen"
 
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 5d50ca191..fc305e2f8 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-09-24 00:54+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -175,7 +175,7 @@ msgstr "Referencias"
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parámetro"
 
@@ -203,6 +203,7 @@ msgstr "Dispositivos"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Información"
 
@@ -1607,6 +1608,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Off"
 
@@ -1706,6 +1709,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "On"
 
@@ -2209,7 +2213,10 @@ msgstr "Método de correo"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "desactivado"
 
@@ -3406,7 +3413,7 @@ msgstr "Necesita"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Parada"
 
@@ -3414,7 +3421,7 @@ msgstr "Parada"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
@@ -3552,7 +3559,7 @@ msgstr "Dirección completa"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "Por defecto"
 
@@ -3763,6 +3770,7 @@ msgid "Release interval"
 msgstr "Intervalo de versión"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -4021,7 +4029,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -4069,7 +4077,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5182,8 +5190,8 @@ msgstr "Preservar"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5476,13 +5484,13 @@ msgstr "Elegir una variable para eliminar o editar"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5533,7 +5541,7 @@ msgstr "Elegir una variable para eliminar o editar"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6703,7 +6711,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "¡No le está permitido eliminar este usuario!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6712,13 +6720,13 @@ msgstr "ninguno"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "No ha introducido el campo obligatorio 'Nombre'."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "No ha introducido el campo obligatorio 'Nombre de pila'."
 
@@ -7302,48 +7310,48 @@ msgstr "El valor introducido como 'GID' es demasiado pequeño."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "¡Hay demasiados grupos, no quedan ID disponibles!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "No hay método de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "leer"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "enviar"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "envío externo"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "Administrador"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Eliminar cuenta de correo"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7352,13 +7360,13 @@ msgstr ""
 "Esta cuenta tiene la extensión de de correo activas. Puede desactivarlas "
 "pulsando aquí."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7367,7 +7375,7 @@ msgstr ""
 "Esta cuenta tiene la extensión de correo desactivada.Puede activarla "
 "pulsando aquí."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -7375,13 +7383,13 @@ msgstr ""
 "Cuando la entrada sea eliminada de LDAP se eliminara la carpeta compartida "
 "del servidor de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Despues de grabar esta cuenta se eliminara la carpeta compartida y todo su "
 "contenido"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
@@ -7389,14 +7397,14 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvío."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
 "sentido."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7408,7 +7416,7 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
@@ -7416,104 +7424,104 @@ msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr "Sin definir"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Mails"
 msgstr "Correos"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Tasks"
 msgstr "Tareas"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Journals"
 msgstr "Diario"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Contactos"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "Notes"
 msgstr "Notas"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Inbox"
 msgstr "Correo Entrante"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Drafts"
 msgstr "Borrador"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr "Enviar elementos"
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr "Correo Basura"
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Ha fallado la eliminación de la configuración de correo del grupo"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Ha fallado la grabación de la configuración de correo del grupo"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "No ha introducido el campo obligatorio'Cuenta Principal'."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "El valor de 'Tamaño de Cuota' no es valido."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Por favor introduzca un valor válido de tamaño máximo de mensajes que serán "
 "rechazados."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Necesita introducir un valor máximo de tamaño de mensajes para poder "
 "rechazar mensajes."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Por favor seleccione una configuración valida de permisos. No se puede dejar "
 "en blanco los permisos por defecto."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Por favor seleccione un servidor de correo valido."
 
@@ -7539,11 +7547,11 @@ msgstr "Direcciones alternativas"
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7595,6 +7603,21 @@ msgstr "Permisos iniciales"
 msgid "Member permission"
 msgstr "Permisos de miembros"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Opciones de correo avanzadas"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
+"dominio"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+"El usuario solo esta permitido a enviar y recibir correo de forma local"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Administración de grupo"
@@ -7975,67 +7998,67 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "Plantillas de ausencia"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Nodo de correo Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "Tipo de buzón de correo"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Idioma del Servidor"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Administrador"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "Administrador del buzón de correo"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "Ocultar las entradas de usuarios en Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "Limitaciones de tamaño de los buzones de correo"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Limitaciones de salida"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "Limitaciones de entrada"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Notificar al usuario"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Direcciones de correo electrónico de Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr "Crear/Editar nueva tarea"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr "Eliminar tareas"
 
@@ -9462,7 +9485,7 @@ msgid "Domain Name Service"
 msgstr "Servicio de nombre de dominio"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Dominio"
 
@@ -9831,7 +9854,7 @@ msgstr "El campo 'Dirección IP' no tiene el formato correcto."
 msgid "The required field 'MAC-address' is not set."
 msgstr "No ha introducido el campo obligatorio'Dirección MAC'."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9966,6 +9989,8 @@ msgstr "Seleccione nombre de la versión"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 #, fuzzy
 msgid "seconds"
 msgstr "(en segundos)"
@@ -12137,6 +12162,15 @@ msgid "Number of listed windows workstations"
 msgstr "Mostrara estaciones de trabajo basadas en windows"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "por defecto"
 
@@ -12668,21 +12702,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' no tiene caracteres validos."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "El campo 'Teléfono' tiene un número de teléfono no valido."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "El campo 'Fax' tiene un número de teléfono no valido."
 
@@ -12938,7 +12972,7 @@ msgstr ""
 "telefónica."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "Por favor seleccione un goFonHomeServer valido."
 
@@ -12965,7 +12999,7 @@ msgstr "Debe haber al menos un número de cola definido."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -13009,8 +13043,8 @@ msgstr "La consulta Mysql ha fallado."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -14164,32 +14198,22 @@ msgstr ""
 "Ha fallado la eliminación de la macro de '%s'. Compruebe el registro de GOsa "
 "por errores mysql."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "Mas de una '(' no está soportada. Linea: '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "Mas de una ')' no está soportada. Linea: '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "No existe ninguna aplicación en la linea: '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "No existe ninguna tipo de extensión en la linea: '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Ha fallado la inserción de una nueva macro para el servidor '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
@@ -14197,27 +14221,27 @@ msgstr ""
 "Debería haber al menos un servidor con una base de datos asterisk para poder "
 "grabar esta macro telefónica."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Ya existe un cn '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "Debe introducir el 'Nombre a Mostrar' para poder guardar esta macro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "EL cn introducido es demasiado largo, máximo 20 caracteres para crear una "
 "entrada de macro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr "No tiene permisos, No puede cambiar el atributo '%s' en goFonMacro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
@@ -14225,7 +14249,7 @@ msgstr ""
 "Esta macro está todavía en uso. Es necesario marcar esta macro como visible "
 "por usuarios."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
@@ -14233,7 +14257,7 @@ msgstr ""
 "La macro está todavía en uso. Para eliminar esta Macro asegúrese que nadie "
 "la ha seleccionado."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
@@ -14241,15 +14265,15 @@ msgstr ""
 "No se puede eliminar la entrada de macro de la bases de datos asterisk. Por "
 "favor compruebe las configuraciones de bases de datos asterisk."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Ha fallado la eliminación de la macro telefónica"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Ha fallado la eliminación de las referencias de la macro telefónica"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Ha fallado la grabación de la macro telefónica"
 
@@ -14315,7 +14339,7 @@ msgstr ""
 "goFonMacro."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14471,26 +14495,26 @@ msgstr ""
 "'%s'. Se cancela guardar las entradas para mantener la consistencia de la "
 "base de datos, compruebe el error mysql en el registro de GOsa."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Ha habido un error mientras se ejecutaba la consulta: "
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr "La macro que ha seleccionado no está disponible, por favor elija otra."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14498,12 +14522,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14511,7 +14535,7 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. No podrá activarla "
 "mientras no se indique un uid."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14519,17 +14543,18 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -14537,11 +14562,11 @@ msgstr ""
 "Debe existir al menos un servidor con una base de datos asterisk para crear "
 "una cuenta telefónica."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "El PIN del buzón de voz debe tener entre 1 a 4 caracteres."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14549,7 +14574,7 @@ msgstr ""
 "El PIN del buzón de voz introducido tiene caracteres no válidos, solo se "
 "permiten valores numéricos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14557,16 +14582,16 @@ msgstr ""
 "El PIN del teléfono introducido tiene caracteres no válidos, solo se "
 "permiten valores alfanuméricos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Ha fallado la grabación de la cuenta de teléfono"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14575,12 +14600,12 @@ msgstr ""
 "El servidor MySQL '%s' no está disponible para el usuario '%s'. compruebe en "
 "el registro de GOsa el error de mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "No puedo seleccionar la base de datos '%s' en '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14588,16 +14613,16 @@ msgstr ""
 "No se puede eliminar la cuenta telefónica, la extensión mysql no aparece en "
 "la configuración de PHP."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Eliminado usuario '%s' de la cola de teléfono '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Ha fallado la eliminación de la cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -15281,18 +15306,18 @@ msgstr "Teléfono Móvil"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Nombre de pila' tiene caracteres no validos"
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "El campo 'Teléfono móvil' tiene un número de teléfono invalido."
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 "El campo 'Dispositivo de Búsqueda' tiene un número de teléfono invalido."
@@ -15662,6 +15687,7 @@ msgid "hour"
 msgstr "hora"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "horas"
 
@@ -15852,120 +15878,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Enero"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Febrero"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Marzo"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "Abril"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Mayo"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Junio"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Julio"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Agosto"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "Septiembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Octubre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "Noviembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "Diciembre"
@@ -16085,21 +16111,6 @@ msgstr "a la carpeta"
 msgid "Reject mails bigger than"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Opciones de correo avanzadas"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
-"dominio"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr ""
-"El usuario solo esta permitido a enviar y recibir correo de forma local"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Seleccionar departamentos"
@@ -16307,7 +16318,7 @@ msgid "User must change password on first login"
 msgstr "Los usuarios deben cambiar su contraseña en el primer inicio de sesión"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
@@ -16317,8 +16328,8 @@ msgstr "Configuración Posix"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
@@ -16404,20 +16415,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Opciones de acceso"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 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:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en windows no necesita contraseña"
 
@@ -16425,115 +16436,122 @@ msgstr "El inicio de sesión en windows no necesita contraseña"
 msgid "Temporary disable samba account"
 msgstr "Desactivar temporalmente la cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "mostrar información"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "Cabecera"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Ocultamiento"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Permitir inicio de sesión en el servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Configuración predeterminada de cliente"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Programa inicial"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Directorio de trabajo"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Tiempo de desconexión (en minutos)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Conexión"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "IDLE"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Dispositivos clientes"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Conectar los discos clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Conectar las impresoras clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Por defecto a la impresora principal del cliente"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Ocultamiento"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "Desconexión o tiempo excedido"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Conectar si se ha desconectado"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Tiempo máximo de inicio de sesión"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Tiempo máximo de cierre de sesión"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "La cuenta expirará después de"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Fecha de inicio de sesión de Samba"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Editar configuración..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16541,12 +16559,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16554,7 +16572,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16563,48 +16581,75 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "entrada activada, notificación activada"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "entrada activada, notificación desactivada"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "entrada desactivada, notificación activada"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "entrada desactivada, notificación desactivada"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "La nueva contraseña es demasiado corta."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr ""
+"El valor indicado como diferencias mínimas de la contraseña no es un valor "
+"numérico."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Ha fallado la eliminación de la cuenta Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Por favor seleccione un goFonHomeServer valido."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Por favor introduzca un valor para el atributo 'ruta'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor introducido como '%s' tiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -16612,7 +16657,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y tiene caracteres "
 "no válidos o está vacía!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16620,7 +16665,7 @@ msgstr ""
 "El administrador de usuarios de windows solo permite ocho clientes. Ha "
 "introducido mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16628,7 +16673,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID sin definir. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16636,10 +16681,146 @@ 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:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Ha fallado la grabación de la cuenta Samba"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Minuto"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Antes"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Off"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Abajo"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "poner"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Características del Teléfono"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Longitud mínima de la contraseña"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Almacén de Contraseñas"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Cambio de contraseña"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "Tiempo de asignación máximo"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Contraseña de administrador"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Localización"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Desconexión"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "activo, no puede cambiar la contraseña"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Parámetros del script"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Ultimo Inicio de Sesion"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Scripts de inicio de sesión"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Confirmar nueva contraseña"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Ultimo Inicio de Sesion"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Ultimo Inicio de Sesion"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatico"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "La contraseña expira en"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "No se le permite cambiar contraseña"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -16785,45 +16966,45 @@ msgstr "no válido"
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Ha fallado la eliminación de la cuenta de usuario genérico"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "No se puede eliminar la cuenta de la base de datos Kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Ha fallado la grabación de la cuenta de usuario genérica"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "No se puede añadir la cuenta a la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "No tiene permisos para mover un usuario desde la 'Base' original."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "No ha introducido el campo obligatorio 'Login'."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -16831,7 +17012,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Nombre de pila' en "
 "la base de datos."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16839,11 +17020,11 @@ msgstr ""
 "El campo 'Login' tiene caracteres no validos. Solo se permiten minúsculas, "
 "números y guiones."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "El campo 'Pagina web' tiene una URL no valida"
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "¡No puedo abrir el certificado especificado!"
 
@@ -16916,11 +17097,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Ultimo Inicio de Sesion"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Información organizativa"
@@ -18096,6 +18272,18 @@ msgstr "Restringir el uso del proxy con cuotas"
 msgid "per"
 msgstr "por"
 
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr "Mas de una '(' no está soportada. Linea: '%s'."
+
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr "Mas de una ')' no está soportada. Linea: '%s'."
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Tiempo máximo de inicio de sesión"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Tiempo máximo de cierre de sesión"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "Esta intentando añadir una dirección de correo no valida"
 
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index e64e8b276..7173402f9 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
-"PO-Revision-Date: 2009-02-26 16:28+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
+"PO-Revision-Date: 2009-04-06 19:34+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -173,7 +173,7 @@ msgstr "Références"
 msgid "Options"
 msgstr "Options"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Paramètres"
 
@@ -201,6 +201,7 @@ msgstr "Périphériques"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Information"
 
@@ -1475,7 +1476,9 @@ msgstr "Vérification du support multi-octets"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "The multi byte string support is required by some plugins."
-msgstr "Le soutien des chaînes de caractères multi octets est requis par certains plugins."
+msgstr ""
+"Le soutien des chaînes de caractères multi octets est requis par certains "
+"plugins."
 
 #: setup/class_setupStep_Checks.inc:114
 msgid "Please compile php with enabled multi byte support '--enable-mbstring'."
@@ -1608,6 +1611,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Eteint"
 
@@ -1711,6 +1716,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Recherchez 'expose_php' dans votre php.ini et mettez le à 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "Ouvert"
 
@@ -1782,15 +1788,18 @@ msgstr "La vérification des schéma à échoué"
 msgid ""
 "Could not read any schema informations, all checks skipped. Adjust your ldap "
 "acls."
-msgstr "Impossible de lire les informations de schéma, tous les contrôles ont été annules. Ajustez les acls de votre annuaire ldap."
+msgstr ""
+"Impossible de lire les informations de schéma, tous les contrôles ont été "
+"annules. Ajustez les acls de votre annuaire ldap."
 
 #: setup/setup_schema.tpl:35
 msgid ""
 "It seems that your ldap database wasn't initialized yet. This maybe the "
 "reason, why GOsa can't read your schema configuration!"
 msgstr ""
-"Il semble que votre base de données ldap n'est pas encore initialisé. Ce peut-être la raison pour laquelle GOsa ne peut lire la configuration de vos schémas."
-"		"
+"Il semble que votre base de données ldap n'est pas encore initialisé. Ce "
+"peut-être la raison pour laquelle GOsa ne peut lire la configuration de vos "
+"schémas.\t\t"
 
 #: setup/class_setup.inc:196
 msgid "Completed"
@@ -2214,7 +2223,10 @@ msgstr "Méthode de messagerie"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "désactivé"
 
@@ -3398,7 +3410,7 @@ msgstr "Requis"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Arrêter"
 
@@ -3406,7 +3418,7 @@ msgstr "Arrêter"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Message d'absence"
@@ -3544,7 +3556,7 @@ msgstr "Adresse complète"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "défaut"
 
@@ -3751,6 +3763,7 @@ msgid "Release interval"
 msgstr "Intervalle de temps"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -4010,7 +4023,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -4058,7 +4071,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5159,8 +5172,8 @@ msgstr "Préserver"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5450,13 +5463,13 @@ msgstr "Choisissez une variable à effacer ou éditer"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5507,7 +5520,7 @@ msgstr "Choisissez une variable à effacer ou éditer"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6670,7 +6683,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cet utilisateur!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6679,13 +6692,13 @@ msgstr "aucun"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
 
@@ -7272,7 +7285,7 @@ msgstr "La valeur spécifiée comme 'GID' est trop petite."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
@@ -7280,42 +7293,42 @@ msgstr ""
 "Il n'y a pas de méthode de messagerie correspondante à la méthode '%s' "
 "spécifiée dans votre fichier de configuration gosa.conf."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "lecture"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "envoyer"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "envoi externe"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "ajouter"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "écrire"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "administrateur"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Ce 'dn' n'a pas d'extension mail valide."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Supprimer le compte de messagerie"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7324,13 +7337,13 @@ msgstr ""
 "L'extension de messagerie est activée pour ce compte, vous pouvez la "
 "désactiver en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Créer un compte de messagerie"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7339,7 +7352,7 @@ msgstr ""
 "L'extension de messagerie est désactivée pour ce compte, vous pouvez "
 "l'activer en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -7347,25 +7360,25 @@ msgstr ""
 "Enlever le dossier partagé du serveur de messagerie quand l'entrée est "
 "enlevée du serveur LDAP"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Effacer le dossier partagé et tout son contenu après avoir sauvegardé ce "
 "compte"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 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."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Utiliser une de vos adresses comme adresse de renvoi n'a pas de sens."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7377,107 +7390,107 @@ msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
 "adresses alternatives."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr "L'adresse entrée est déjà utilisée par un utilisateur"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr "Non défini"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Mails"
 msgstr "Messagerie"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Tasks"
 msgstr "Tâche"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Journals"
 msgstr "Journaux"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Contacts"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "Notes"
 msgstr "Notes"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Drafts"
 msgstr "Brouillon"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr "Eléments envoyés"
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr "Messages indésirables"
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "La suppression des paramètres de messagerie pour le groupe à échoué"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "La sauvegarde des paramètres de messagerie pour le groupe à échoué"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Le champ obligatoire 'Adresse Principale' n'est pas rempli."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
 "principale'."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "L'adresse principale entrée est déjà utilisée."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "La valeur dans le champ 'Taille du quota' n'est pas valide."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 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."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Il est nécessaire d'indiquer une taille maximale des messages afin de "
 "pouvoir en rejeter certains."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 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."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Veuillez sélectionner un serveur de messagerie valide."
 
@@ -7503,11 +7516,11 @@ msgstr "Adresses alternatives"
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de messagerie alternatives"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Transférer les messages vers un membre n'appartenant pas au groupe"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7559,6 +7572,22 @@ msgstr "Permission par défaut"
 msgid "Member permission"
 msgstr "Permission des membres"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Options de messagerie avancées"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Sélectionnez si vous voulez que les utilisateurs puissent envoyer et "
+"recevoir des messages uniquement dans son propre domaine"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+"Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des messages "
+"locaux"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Administration du groupe"
@@ -7940,65 +7969,65 @@ msgstr "Afficher les adresses de l'utilisateur"
 msgid "User name of which addresses are shown"
 msgstr "Utilisateur dont on montre les adresses"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 msgid "Enable vacation message"
 msgstr "Activer la notification d'absence"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 msgid "Vacation start/stop"
 msgstr "Activation/désactivation du message d'absence"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Noeud de mail Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "Classe du compte de messagerie"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Langue du serveur"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "Administrateur du compte de messagerie"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "Cacher l'entrée de l'utilisateur sans Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "Limitation en taille du compte de messagerie"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Limite en sortie"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "Limite en entrée"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Avertir l'utilisateur"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Adresse de messagerie Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr "Création / Edition d'une nouvelle tâche"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr "Supprimer les tâches"
 
@@ -9420,7 +9449,7 @@ msgid "Domain Name Service"
 msgstr "DNS"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Domaine"
 
@@ -9787,7 +9816,7 @@ msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
 msgid "The required field 'MAC-address' is not set."
 msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9918,6 +9947,8 @@ msgstr "Temps de bail de défaut"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 msgid "seconds"
 msgstr "secondes"
 
@@ -12046,6 +12077,15 @@ msgid "Number of listed windows workstations"
 msgstr "Nombre des stations de travail Windows"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "défaut"
 
@@ -12570,21 +12610,21 @@ msgstr "Le champ 'Nom' contient le mot réservé '%s'. Veuillez choisir un autre
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Le champ 'Nom' contient des caractères invalides."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Le champ 'Téléphone' contient un numéro invalide."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Le champ 'Fax' contient un numéro invalide."
 
@@ -12847,7 +12887,7 @@ msgstr ""
 "créer un queue téléphonique."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "Veuillez sélectionner un serveur de téléphonique valide (goFonHomeServer)."
 
@@ -12874,7 +12914,7 @@ msgstr "Il doit y avoir au moins un numéro de queue définie."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12918,8 +12958,8 @@ msgstr "La requête Mysql à échoué."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -14069,32 +14109,22 @@ msgstr ""
 "L'effacement de la macro depuis '%s' à échoué. Veuillez vérifier les "
 "journaux système de GOsa pour les erreurs mysql."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "Plus d'un '(' n'est actuellement pas supporté. Ligne : '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "Plus d'une ')' n'est actuellement pas supporté, Ligne : '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "Il y a pas d'application indiquée à la ligne : '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "Il n'y a pas de type d'extension indiquée à la ligne : '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "L'insertion de la nouvelle macro à échoué pour le serveur '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
@@ -14102,29 +14132,29 @@ msgstr ""
 "Il doit y avoir au moins un serveur avec la base de donnée asterisk pour "
 "sauver cette macro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Le cn indiqué '%s' existe déjà."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 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"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Le cn introduit est trop long, pour créer une macro le maximum est de 20 "
 "caractères."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Permissions insuffisantes, vous ne pouvez pas changer l'attribut '%s' dans "
 "la macro goFonMacro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
@@ -14132,7 +14162,7 @@ msgstr ""
 "Cette macro est toujours utilisée. Il est nécessaire de marquer cette macro "
 "comme visible pour tout les utilisateurs."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
@@ -14140,7 +14170,7 @@ msgstr ""
 "Cette macro est toujours utilisée. Pour effacer cette macro, assurez vous "
 "que personne ne la sélectionnée."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
@@ -14148,15 +14178,15 @@ msgstr ""
 "Impossible d'effacer la macro de la base de données asterisk. Veuillez "
 "vérifier la configuration de la base de donnée asterisk."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "La suppression de la macro téléphonique à échoué"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "La suppression des références de la macro téléphonique à échoué"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "La sauvegarde de la macro téléphonique à échoué"
 
@@ -14222,7 +14252,7 @@ msgstr ""
 "macro téléphonique."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14377,16 +14407,16 @@ msgstr ""
 "'%s'. Abandon des sauvegardes pour garder la consistance de la base de "
 "données, veuillez vérifier les journaux systèmes GOsa pour les erreurs mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Une erreur s'est produite lors de la requête:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "Ce compte n'est pas d'extension téléphoniques."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
@@ -14394,11 +14424,11 @@ msgstr ""
 "La macro que vous aviez choisi dans le passé n'est plus disponible, veuillez "
 "en choisir une autre."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Supprimer l'extension téléphonique"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14406,12 +14436,12 @@ msgstr ""
 "Une extension téléphone existe pour cet utilisateur. Vous pouvez la "
 "supprimer en cliquant sur le bouton ci-dessous."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Créer un compte téléphone"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14419,7 +14449,7 @@ msgstr ""
 "Aucun extension téléphone n'existe pour cet utilisateur. Vous ne pouvez pas "
 "l'activer lorsque aucun uid n'est indiqué."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14427,19 +14457,20 @@ msgstr ""
 "Aucun extension téléphone n'existe pour cet utilisateur. Vous pouvez en "
 "créer une en cliquant sur le bouton ci-dessous."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 "Veuillez entrer un numéro de téléphone valide ! A cause de l'extension "
-"realtime, les nombres doivent être plus petits que onze chiffres."
+"realtime, les nombres doivent être plus petits que %s chiffres."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Choisissez votre téléphone privé"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -14447,11 +14478,11 @@ msgstr ""
 "Il doit y avoir au moins un serveur avec une base de données asterisk pour "
 "créer un compte téléphonique."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Le code pin de la boîte vocale doit être entre 1-4 caractères."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14459,7 +14490,7 @@ msgstr ""
 "Le code pin de la boîte vocale contient des caractères invalides, seul les "
 "chiffres sont autorisés."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14467,16 +14498,16 @@ msgstr ""
 "Le code pin du téléphone contient des caractères invalides. Seul les "
 "chiffres et les lettres sont autorisés."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Vous devez au moins indiquer un numéro de téléphone !"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "La sauvegarde du compte téléphonique à échoué"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14485,12 +14516,12 @@ msgstr ""
 "Le serveur MySQL '%s' n'est pas joignable avec l'utilisateur '%s', veuillez "
 "vérifier les journaux système GOsa pour les erreurs mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Impossible de sélectionner la base de données %s située sur %s."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14498,16 +14529,16 @@ msgstr ""
 "Impossible de supprimer le compte téléphonique, l'extension mysql n'est pas "
 "présente dans la configuration php."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "La suppression du compte téléphonique à échoué"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -15184,18 +15215,18 @@ msgstr "GSM"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Le champ 'Nom complet' contient des caractères invalides."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Le champ 'GSM' contient un numéro invalide."
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Le champ 'Bip' contient un numéro invalide."
 
@@ -15564,6 +15595,7 @@ msgid "hour"
 msgstr "heure"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "heures"
 
@@ -15752,120 +15784,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Janvier"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Février"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Mars"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "Avril"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Mai"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Juin"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Juillet"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Août"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "Septembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Octobre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "Novembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "Décembre"
@@ -15987,22 +16019,6 @@ msgstr "vers le dossier"
 msgid "Reject mails bigger than"
 msgstr "Rejeter les messages plus gros que"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Options de messagerie avancées"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Sélectionnez si vous voulez que les utilisateurs puissent envoyer et "
-"recevoir des messages uniquement dans son propre domaine"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr ""
-"Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des messages "
-"locaux"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Sélectionner un département"
@@ -16207,7 +16223,7 @@ msgid "User must change password on first login"
 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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
@@ -16217,8 +16233,8 @@ msgstr "Paramètres Posix"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Répertoire Home"
 
@@ -16303,22 +16319,22 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Options d'accès"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 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:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "L'identification sur une station windows ne nécessite pas de mot de passe"
 
@@ -16326,115 +16342,119 @@ msgstr "L'identification sur une station windows ne nécessite pas de mot de pas
 msgid "Temporary disable samba account"
 msgstr "Désactiver temporairement le compte Samba"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+msgid "Show information"
+msgstr "Montrer les informations"
+
+#: plugins/personal/samba/samba3.tpl:61
+msgid "Hide"
+msgstr "Masquer"
+
+#: plugins/personal/samba/samba3.tpl:63
+msgid "Show"
+msgstr "Afficher"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Programme initial"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Répertoire de travail"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Connexion"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Déconnexion"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "En attente"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Périphériques clients"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Connecter les lecteurs clients à l'identification"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Connecter les imprimantes clients à l'identification"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Imprimante par défaut"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Masquer"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "Sur interrompu ou temps d'attente dépassé"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Reconnexion si déconnecté"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Limiter les temps d'accès"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Limiter les heures de déconnections"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Le compte expire après"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Heures d'accès à Samba"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Editer les paramètres..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "Aucune extension samba pour cet utilisateur."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Supprimer le compte Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16442,12 +16462,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:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Créer un compte Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16455,7 +16475,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:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16463,55 +16483,80 @@ 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:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "entrée activée, notification activée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "entrée activée, notification désactivée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "entrée désactivée, notification activée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "entrée désactivée, notification désactivée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "remise à zéro"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "de n'importe quel client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "Le mot de passe est périmé depuis %s, par la politique domaine."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "Le mot de passe est valide jusqu'a %s, par la politique utilisateur."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr "Le mot de passe est valide jusqu'au %s, par la politique domaine."
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "La suppression du compte Samba à échoué"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Veuillez sélectionner une valeur pour 'Le lecteur de l'utilisateur'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Veuillez spécifier une valeur pour 'Le chemin du répertoire utilisateur'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, 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:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 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:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16519,7 +16564,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:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16527,7 +16572,7 @@ msgstr ""
 "Attention: Ce compte possède un SID samba non assigné: Le problème ne peut "
 "pas être fixé par GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16535,10 +16580,128 @@ 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:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "La sauvegarde du compte Samba à échoué"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+msgid "minutes"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+msgid "forever"
+msgstr "toujours"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+msgid "off"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+msgid "on"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+msgid "unset"
+msgstr "desactivé"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr "immédiatement"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+msgid "Domain attributes"
+msgstr "Attribut du domaine"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+msgid "Min password length"
+msgstr "Taille minimum des mots de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+msgid "Password history"
+msgstr "Historique des mots de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+msgid "Force password change"
+msgstr "Forcer le changement de mot de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+msgid "Maximum password age"
+msgstr "Age maximum du mot de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+msgid "Minimum password age"
+msgstr "Age minimum du mot de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+msgid "Lockout duration"
+msgstr "La durée de blocage"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr "Nombre de mauvaise tentative avant le blocage"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+msgid "Disconnect time"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+msgid "Refuse machine password change"
+msgstr "Refuser le changement de mot de passe des machines"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+msgid "User attributes"
+msgstr "Attributs de l'utilisateur"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+msgid "Last failed login"
+msgstr "Dernière connexion échouée"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+msgid "Logon attempts"
+msgstr "Tentative de connexions"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Nouveau mot de passe"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+msgid "Last logon"
+msgstr "Dernière connexion"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Dernière connexion"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatique"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Le mot de passe expirera le"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Le changement du mot de passe n'est pas autorisé"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Sélectionner les stations à ajouter"
@@ -16686,53 +16849,53 @@ msgstr "invalide"
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "La suppression du compte générique à échoué"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "La communication vers la base de données kerberos a échoué"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Impossible de supprimer l'utilisateur de la base de données kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "La sauvegarde du compte générique à échoué"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 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'."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation pour déplacer un utilisateur depuis la 'Base' "
 "originale."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Une personne ayant cet 'Identifiant' existe déjà dans l'annuaire."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr "Une personne ayant ce 'Nom'/'Nom Complet' existe déjà dans l'annuaire."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16740,11 +16903,11 @@ msgstr ""
 "Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
 "chiffres et tirets sont autorisés."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Le champ 'Page d'accueil' contient une URL invalide."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Impossible d'ouvrir le certificat demandé !"
 
@@ -16817,10 +16980,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Editer les propriétés"
 
-#: plugins/personal/generic/generic.tpl:191
-msgid "Last logon"
-msgstr "Dernière connexion"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index e94a48687..ee0020369 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-07-13 18:38+0100\n"
 "Last-Translator: Guido Serra <zeph@purotesto.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -175,7 +175,7 @@ msgstr "Referenze"
 msgid "Options"
 msgstr "Opzioni"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parametri"
 
@@ -203,6 +203,7 @@ msgstr "Componenti (device)"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Informazione"
 
@@ -1622,6 +1623,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 #, fuzzy
 msgid "Off"
 msgstr "Sconnesso"
@@ -1740,6 +1743,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Cerca il parametro 'expose_php' nel tuo php.ini e impostalo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 #, fuzzy
 msgid "On"
 msgstr "Apri"
@@ -2285,7 +2289,10 @@ msgstr "Metodo di posta"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "Disabilitato"
 
@@ -3514,7 +3521,7 @@ msgstr "Punteggio (score) richiesto"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Ferma"
 
@@ -3522,7 +3529,7 @@ msgstr "Ferma"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Messaggio per assenze"
@@ -3671,7 +3678,7 @@ msgstr "Indirizzo e-mail"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 #, fuzzy
 msgid "Default"
 msgstr "default"
@@ -3901,6 +3908,7 @@ msgid "Release interval"
 msgstr "Intervallo di tempo"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -4171,7 +4179,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -4219,7 +4227,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5317,8 +5325,8 @@ msgstr "Preserva (preserve)"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5615,13 +5623,13 @@ msgstr "Scegli la variabile da cancellare o modificare"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5672,7 +5680,7 @@ msgstr "Scegli la variabile da cancellare o modificare"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6846,7 +6854,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "Non ti è permesso di cancelale qusto utente!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6855,13 +6863,13 @@ msgstr "nessuno"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Il capo obbligatorio 'Nome' non è compilato."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Il campo obligatorio 'Nome (given name??)' non è completato."
 
@@ -7473,7 +7481,7 @@ msgstr "Il valore specificato come 'GID' è troppo piccolo."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "Troppi utenti, non ho un ID da allocare!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
@@ -7481,43 +7489,43 @@ msgstr ""
 "Non è specificato un metodo di inoltro posta '%s' nel file gosa.conf "
 "disponibile."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "leggi"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "post"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "post 'esterno'"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "append"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "scrivi"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 #, fuzzy
 msgid "admin"
 msgstr "Amministratori"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Questo 'dn' non ha una valida estensione mail"
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Rimuovi utente di posta"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7526,13 +7534,13 @@ msgstr ""
 "Questo utente ha le caratteristiche di posta abilitate. Potete disabilitarle "
 "cliccando sotto."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Crea un utente di posta"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7541,7 +7549,7 @@ msgstr ""
 "Questo utente ha le caratteristiche di posta disabilitate. Potete abilitarle "
 "cliccando sotto."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -7549,13 +7557,13 @@ msgstr ""
 "Rimuovi le cartelle condivise dal server di posta quando questi valori sono "
 "rimossi da LDAP"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Rimuovi le cartelle condivise e tutto il loro contenuto dopo aver salvato "
 "questo utente"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
@@ -7563,14 +7571,14 @@ msgstr ""
 "State provando ad aggiungere un indirizzo di posta elettronica errato alla "
 "lista degli inoltri."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Aggiungere uno dei vostri indirizzi di posta agli indirizzi di inoltro non è "
 "corretto."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7582,117 +7590,117 @@ msgstr ""
 "State provando ad aggiungere un indirizzo di posta elettronica non valido "
 "alla lista degli indirizzi alternativi."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr "L'indirizzo che state provando ad aggiungere è già utilizzato"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Unspecified"
 msgstr "Non definito"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 #, fuzzy
 msgid "Mails"
 msgstr "Posta/Mail"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Tasks"
 msgstr "Compito (task)"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Journals"
 msgstr "ore"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Contatti"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 #, fuzzy
 msgid "Notes"
 msgstr "Nessuno"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Inbox"
 msgstr "Indice"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 #, fuzzy
 msgid "Drafts"
 msgstr "data"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Rimozione delle specifiche dei gruppi di posta fallita"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Salvataggio delle specifiche dei gruppi di posta fallita"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Il campo obbligatorio 'Indirizzo principale' non è configurato."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Per favore inserite un validoi indirizzo e-mail nel campo 'Indirizzo "
 "principale'."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "L'indirizzo primario inserito è già in uso."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "Valore di 'Quota' non valido."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Per favore specificate una corretta dimensione della posta che deve essere "
 "rifiutata."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Non avete definito la dimensione massima della posta che deve essere "
 "rifiutata."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Per favore scegli delle valide impostazioni di permesso. Le impostazioni di "
 "permesso non possono essere vuote."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Per favore selezionate un valido server di posta."
 
@@ -7718,11 +7726,11 @@ msgstr "Indirizzo alternativi"
 msgid "List of alternative mail addresses"
 msgstr "Lista degli indirizzi e-mail alternativi"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi anche ai non componenti dei gruppi"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7775,6 +7783,20 @@ msgstr "Permessi di default"
 msgid "Member permission"
 msgstr "Permessi dei componenti"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Opzioni avanzate di posta"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Selezionate se l'utente può solo spedire o ricevere posta all'interno del "
+"dominio"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "L'utente può solo spedire e ricevere mail in locale"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Gruppo Amministrativo"
@@ -8152,75 +8174,75 @@ msgstr "Mostra di indirizzi dell'utente"
 msgid "User name of which addresses are shown"
 msgstr "Nome dell'utente i cui indirizzi sono mostrati"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "Attivate la funzione di messaggio automatico per assenza"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "Modello delle workstation"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 #, fuzzy
 msgid "Mailbox class"
 msgstr "Indirizzo e-mail"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 #, fuzzy
 msgid "Server language"
 msgstr "Nome server"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 #, fuzzy
 msgid "Mailbox administrator"
 msgstr "Cartelle degli amministratori"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 #, fuzzy
 msgid "Mailbox size limitations"
 msgstr "Settaggi di posta"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 #, fuzzy
 msgid "Limit outbound"
 msgstr "Tempo limite di connessione"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 #, fuzzy
 msgid "Notify user"
 msgstr "Conta gli utenti"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 #, fuzzy
 msgid "Scalix email addresses"
 msgstr "Indirizzo e-mail"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Create/edit new task"
 msgstr "Crea un nuovo utilizzatore"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Remove tasks"
 msgstr "Rimuovi opzioni"
@@ -9652,7 +9674,7 @@ msgid "Domain Name Service"
 msgstr "Servizio Time"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Dominio"
 
@@ -10024,7 +10046,7 @@ msgstr "Il formato IP è errato nel campo 'indirizzo-IP'"
 msgid "The required field 'MAC-address' is not set."
 msgstr "Il campo obbligatorio 'MAC-address' non è definito."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -10162,6 +10184,8 @@ msgstr "Seleziona il nome rilasciato"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 #, fuzzy
 msgid "seconds"
 msgstr "(in secondi)"
@@ -12337,6 +12361,15 @@ msgid "Number of listed windows workstations"
 msgstr "Mostra le workstation Microsoft Windows"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "default"
 
@@ -12868,21 +12901,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Il campo 'Nome' contiene dei caratteri non validi."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Il campo 'Telefono' contiene un numero di telefono non valido."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Il campo 'Fax' contiene un numero di telefono non valido."
 
@@ -13134,7 +13167,7 @@ msgid ""
 msgstr "Ci deve essere almeno un server NTP selezionato."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 #, fuzzy
 msgid "Please select a valid goFonHomeServer."
 msgstr "Per favore selezionate un valido server di posta."
@@ -13162,7 +13195,7 @@ msgstr "Deve esserci almeno un numero di coda definito."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -13204,8 +13237,8 @@ msgstr "La query di interrogazione del database è fallita!"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -14359,36 +14392,22 @@ msgstr ""
 "Il server MySQL '%s' non è raggiungibile per l'utente '%s'; controlla il "
 "file di log di GOsa per identificare gli errori mysql."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, fuzzy, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr ""
-"La creazione automatica del tipo '%s' non è attualmente supportata. Per "
-"favore riprotare le informazioni al GOsa team."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, fuzzy, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr ""
-"La creazione automatica del tipo '%s' non è attualmente supportata. Per "
-"favore riprotare le informazioni al GOsa team."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, fuzzy, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "C'è un valore duplicato in '%s' per '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, fuzzy, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Login dell'utente fallito. Il server LDAP risponde '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to save this "
@@ -14397,27 +14416,27 @@ msgstr ""
 "Ci deve essere almeno un server NTP selezionato o la modalità di "
 "ereditarietà non sarà attivata."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "il cn '%s' indicato già esiste."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "Devi specificare il 'Mostra nome' per poter salvare questa macro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Il cn fornito è troppo lungo pre creare una 'entry'; massimo 20 caratteri."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Permessi insufficienti, non posso cam,biare l'attrivuto '%s' in goFonMacro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 #, fuzzy
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
@@ -14426,7 +14445,7 @@ msgstr ""
 "La macro è ancora in suo. Prima di cancellare la Macro devi verificae che "
 "nessun utente l'abbia selezionata."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 #, fuzzy
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
@@ -14435,7 +14454,7 @@ msgstr ""
 "La macro è ancora in suo. Prima di cancellare la Macro devi verificae che "
 "nessun utente l'abbia selezionata."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 #, fuzzy
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
@@ -14444,15 +14463,15 @@ msgstr ""
 "Non posso connettermi al database specificato; controllate la configurazione "
 "glpi."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Rimozione della macro telefonica fallita"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Rimozione delle regole delle macro telefoniche fallito"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Salvataggio della macro telefonica fallito"
 
@@ -14517,7 +14536,7 @@ msgstr ""
 "Permessi insufficienti, non puoi cambiare gli attributi '%s' in goFonMacro."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14664,27 +14683,27 @@ msgstr ""
 "Il server MySQL '%s' non è raggiungibile per l'utente '%s'; verifica il file "
 "di log di GOsa per gli errori MySql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Errore nell'esecuzione dell'interrogazione:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "L'utente non ha estensioni telefoniche."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 "la macro selezionata non è più dispobilie, per favore sceglierne un'altra."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Rimuovi utente telefonico"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14692,12 +14711,12 @@ msgstr ""
 "L'utente ha le impostazioni telefoniche abilitate. Potete disabilitarle "
 "cliccando sotto."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Crea un utente telefonico"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14705,7 +14724,7 @@ msgstr ""
 "L'utente ha le impostazioni telefoniche disabilitate. Non potete abilitarle "
 "se non è definito un UID."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14713,17 +14732,18 @@ msgstr ""
 "L'utente ha le impostazioni telefoniche disabilitate. Potete abilitarle "
 "cliccando sotto."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Scegli il tuo numero personale di telefono"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -14732,11 +14752,11 @@ msgstr ""
 "Ci deve essere almeno un server NTP selezionato o la modalità di "
 "ereditarietà non sarà attivata."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Il PIN della Segreteria telefonica deve contenere da 1 a 4 caratteri."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14744,7 +14764,7 @@ msgstr ""
 "Il PIN della segreteria telefonica indicato contiene caratteri non ammessi; "
 "sono consentiti solo valori numerici."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14752,16 +14772,16 @@ msgstr ""
 "Il PIN della telefono indicato contiene caratteri non ammessi; sono "
 "consentiti solo valori alfanumerici."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "devi specificare almeno un numero telefonico!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Salvataggio dell'utente telefonico fallito"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14770,12 +14790,12 @@ msgstr ""
 "Il server MySQL '%s' non è raggiungibile per l'utente '%s'; controlla il "
 "file di log di GOsa per identificare gli errori mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Non posso selezionare il database %s in %s."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14783,16 +14803,16 @@ msgstr ""
 "Non posso cancellare l'utente telefonico; l'estensione mysql non è presente "
 "nella configurazione php."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Rimozione dell'utente '%s' dalla coda telefonica '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Rimozione dell'utente telefonico fallita"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -15483,18 +15503,18 @@ msgstr "Telefono cellulare"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Il campo 'Nome(Given name)' contiene dei caratteri non validi."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Il campo 'Mobile' contiene un numero di telefono non valido."
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Il campo 'Pager' contiene un numero di telefono non valido."
 
@@ -15864,6 +15884,7 @@ msgid "hour"
 msgstr "ora"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "ore"
 
@@ -16051,120 +16072,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "gennaio"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "febbraio"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "marzo"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "aprile"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "maggio"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "giugno"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "luglio"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "agosto"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "settembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "ottobre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "novembre"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "dicembre"
@@ -16285,20 +16306,6 @@ msgstr "alla cartella"
 msgid "Reject mails bigger than"
 msgstr "Rifiutate mail di dimensione maggiore a"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Opzioni avanzate di posta"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Selezionate se l'utente può solo spedire o ricevere posta all'interno del "
-"dominio"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "L'utente può solo spedire e ricevere mail in locale"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Dipartimento selezionate"
@@ -16507,7 +16514,7 @@ msgid "User must change password on first login"
 msgstr "L'utente deve cambiare la password al primo accesso"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "La password scade il "
 
@@ -16517,8 +16524,8 @@ msgstr "Settaggi Posix"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Home directory"
 
@@ -16604,20 +16611,20 @@ msgid "Script path"
 msgstr "Path degli 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Percorso per i profili"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Opzioni di accesso"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr "Permetti agli utenti di cambiare la password dai loro client"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "Accesso dai client windows non richiede la password"
 
@@ -16625,117 +16632,124 @@ msgstr "Accesso dai client windows non richiede la password"
 msgid "Temporary disable samba account"
 msgstr "Disabilita temporaneamente l'account samba"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "Informazioni personali"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "header"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Shadowing"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Consenti accesso da un terminal server"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Eredita la configurazione client"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Programma iniziale"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Directory di lavoro"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Tempo di timeout (in minuti)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Connessione"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Disconnessione"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "IDLE"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Dispositivo client"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Collega i drives dei client alla connessione"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Collega le stampanti dei client alla connessione"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Default alla stampante del client principale"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Miscellanea"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Shadowing"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "In caso di guasto o timeout"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Ricollega in caso di disconnessione"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Blocca gli utenti samba"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Tempo limite di connessione"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Temnpo limite di disconnessione"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Scadenza utenti dopo"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Samba home"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Settaggi Unix"
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Permetti connessioni solo da queste workstation"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "Questo utente non ha estensioni samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Rimuovi l'utente samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16743,12 +16757,12 @@ msgstr ""
 "Questo utente ha le estensioni samba abilitate. Potete disabilitarle "
 "cliccando sotto."
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Crea un utente samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16756,7 +16770,7 @@ msgstr ""
 "Questo utente ha le estensioni samba disabilitate. Potete abilitarle "
 "cliccando sotto."
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16764,48 +16778,73 @@ msgstr ""
 "Questo utente ha le estensioni samba abilitate. Le caratteristiche posix "
 "sono necessarie per gli utenti samba, abilitatele prima."
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "input 'on', notifica 'on'"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "input 'on', notifica 'off'"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "input 'off', notifica 'on'"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "input 'off', notifica 'off'"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "disconnettiti"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "reset"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "da ogni client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "solo dal precedente client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "La password utilizzata come nuova é troppo corta."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "La porta Sieve deve essere indicata con un numero."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Rimozione utente samba fallita"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Per favore selezionate un valido server di posta."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Per favore specifica un valore per l'attributo 'percorso'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene caratteri non validi!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -16813,7 +16852,7 @@ msgstr ""
 "La proprietà di timeout '%s' è attiva e non contiene caratteri o ne include "
 "di non validi!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16821,7 +16860,7 @@ msgstr ""
 "Le finestre di gestione degli utenti permettono solo otto client. Ne hai "
 "specificati più di otto."
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16829,7 +16868,7 @@ msgstr ""
 "Attenzione: questo utente ha un SID samba assegnato che è indefinito. Questa "
 "incongruenza non può essere risolta da  GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16837,10 +16876,146 @@ msgstr ""
 "Attenzione: non posso identifcare un gruppo primario di utilizzatori. "
 "Nessuna conversione a gruppi samba è possibile!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Salvataggio utente samba fallito"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Stampanti"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Aggiorna"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Sconnesso"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Giù"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "imposta"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Attributi del telefono"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Password dell'amministratore"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Archiviazione password"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Il cambio della password non è permesso"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "massiam dimensione file"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Password dell'amministratore"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Lacalizzazione"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Disconnessione"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "attivo, password non modificabile"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Attributi script"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Ultimo login"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Script di accesso"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Nuova password"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Ultimo login"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Ultimo login"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "automatico"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "La password scade il "
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Il cambio della password non è permesso"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Seleziona le workstation da aggiungere"
@@ -16989,45 +17164,45 @@ msgstr "non valido"
 msgid "No certificate installed"
 msgstr "Nessun certificato installato"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Rimozione di un generico utente fallita"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Comunicazione con il database kerberos fallita"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Non posso rimuovere l'utente dal database kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Salvataggio dell'utente genrico fallita"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "Non posso aggiungere un utente al database kerberos."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "Non hai il permesso di creare un utente in questa 'Base'."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "Non hai il permesso di spostare un utente dalla 'Base' originale."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "C'è già una persona con questo 'codice utente (login)' nel database."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Il campo richiesto di 'Login' non è compilato."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -17035,7 +17210,7 @@ msgstr ""
 "C'è già una risorsa con la combinazione 'Nome'/'Nome(Given name)' nel "
 "database."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -17043,11 +17218,11 @@ msgstr ""
 "Il campo 'Login' contiene caratteri non validi. Caratteri minuscoli, numeri "
 "e punti non sono permessi."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Il campo 'Homepage' contiente una definizione URL inesatta."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Non posso aprire il certifcato specificato!"
 
@@ -17120,11 +17295,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Modifica proprietà"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Ultimo login"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Informazioni sull'organizzazione"
@@ -18313,6 +18483,24 @@ msgstr "Restrizione Quota all'uso del proxy"
 msgid "per"
 msgstr "per"
 
+#, fuzzy
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr ""
+#~ "La creazione automatica del tipo '%s' non è attualmente supportata. Per "
+#~ "favore riprotare le informazioni al GOsa team."
+
+#, fuzzy
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr ""
+#~ "La creazione automatica del tipo '%s' non è attualmente supportata. Per "
+#~ "favore riprotare le informazioni al GOsa team."
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Tempo limite di connessione"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Temnpo limite di disconnessione"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "Stai provando ad aggiungere un indirizzo mail non valido"
 
diff --git a/locale/messages.po b/locale/messages.po
index c2aa7f659..1889254fa 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: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr ""
 
@@ -203,6 +203,7 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr ""
 
@@ -1508,6 +1509,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr ""
 
@@ -1589,6 +1592,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr ""
 
@@ -2057,7 +2061,10 @@ msgstr ""
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr ""
 
@@ -3163,7 +3170,7 @@ msgstr ""
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr ""
 
@@ -3171,7 +3178,7 @@ msgstr ""
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr ""
@@ -3309,7 +3316,7 @@ msgstr ""
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr ""
 
@@ -3512,6 +3519,7 @@ msgid "Release interval"
 msgstr ""
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -3757,7 +3765,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -3805,7 +3813,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -4803,8 +4811,8 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5086,13 +5094,13 @@ msgstr ""
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5143,7 +5151,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6259,7 +6267,7 @@ msgid "You are not allowed to delete this user!"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6268,13 +6276,13 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -6843,89 +6851,89 @@ msgstr ""
 msgid "Too many groups, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -6935,102 +6943,102 @@ msgid ""
 "addresses."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Mails"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Tasks"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Journals"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "Notes"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Inbox"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Drafts"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -7056,11 +7064,11 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7112,6 +7120,18 @@ msgstr ""
 msgid "Member permission"
 msgstr ""
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr ""
@@ -7475,65 +7495,65 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 msgid "Enable vacation message"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 msgid "Vacation start/stop"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr ""
 
@@ -8886,7 +8906,7 @@ msgid "Domain Name Service"
 msgstr ""
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr ""
 
@@ -9241,7 +9261,7 @@ msgstr ""
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9366,6 +9386,8 @@ msgstr ""
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 msgid "seconds"
 msgstr ""
 
@@ -11368,6 +11390,15 @@ msgid "Number of listed windows workstations"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr ""
 
@@ -11864,21 +11895,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -12107,7 +12138,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr ""
 
@@ -12134,7 +12165,7 @@ msgstr ""
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12171,8 +12202,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -13273,82 +13304,72 @@ msgstr ""
 msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr ""
 
@@ -13409,7 +13430,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -13545,117 +13566,118 @@ msgid ""
 "entries to keep the database consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -14299,18 +14321,18 @@ msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
@@ -14647,6 +14669,7 @@ msgid "hour"
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr ""
 
@@ -14827,120 +14850,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr ""
@@ -15050,18 +15073,6 @@ msgstr ""
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr ""
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr ""
@@ -15256,7 +15267,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr ""
 
@@ -15266,8 +15277,8 @@ msgstr ""
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr ""
 
@@ -15352,20 +15363,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -15373,206 +15384,348 @@ msgstr ""
 msgid "Temporary disable samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+msgid "Show information"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:61
+msgid "Hide"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:63
+msgid "Show"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr ""
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr ""
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 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:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+msgid "minutes"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+msgid "forever"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+msgid "off"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+msgid "on"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+msgid "unset"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+msgid "Domain attributes"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+msgid "Min password length"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+msgid "Password history"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+msgid "Force password change"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+msgid "Maximum password age"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+msgid "Minimum password age"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+msgid "Lockout duration"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+msgid "Disconnect time"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+msgid "Refuse machine password change"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+msgid "User attributes"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+msgid "Last failed login"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+msgid "Logon attempts"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+msgid "Last password update"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+msgid "Last logon"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+msgid "Last logoff"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+msgid "Automatic logoff"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+msgid "Password expires"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+msgid "Password change available"
+msgstr ""
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -15708,61 +15861,61 @@ msgstr ""
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -15835,10 +15988,6 @@ msgstr ""
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:191
-msgid "Last logon"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr ""
diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index bec5f42ae..65686c380 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: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-07-19 16:40+0200\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -178,7 +178,7 @@ msgstr "Referenties"
 msgid "Options"
 msgstr "Opties"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parameters"
 
@@ -206,6 +206,7 @@ msgstr "Apparaten"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Informatie"
 
@@ -1614,6 +1615,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Uit"
 
@@ -1717,6 +1720,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Zoek naar 'expose_php' in uw php.ini en stel deze op 'Off' in."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "Aan"
 
@@ -2220,7 +2224,10 @@ msgstr "E-mail methode"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "gedeactiveerd"
 
@@ -3406,7 +3413,7 @@ msgstr "Vereist"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Stop"
 
@@ -3414,7 +3421,7 @@ msgstr "Stop"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
@@ -3552,7 +3559,7 @@ msgstr "Volledig adres"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "Standaard"
 
@@ -3761,6 +3768,7 @@ msgid "Release interval"
 msgstr "Verwijder interval"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -4019,7 +4027,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -4067,7 +4075,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5175,8 +5183,8 @@ msgstr "Bewaar"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5466,13 +5474,13 @@ msgstr "Kies een te bewerken of verwijderen variabele"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5523,7 +5531,7 @@ msgstr "Kies een te bewerken of verwijderen variabele"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6697,7 +6705,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6706,13 +6714,13 @@ msgstr "geen"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
@@ -7300,48 +7308,48 @@ msgstr "De opgegeven 'GID' waarde is te klein."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "Te veel groepen. Kan geen vrij ID toewijzen!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "De E-mail methode '%s' opgegeven in uw gosa.conf is niet beschikbaar."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "alleen lezen"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "afleveren & lezen"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "alleen afleveren"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "afleveren, lezen & kopieren"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "Beheerder"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Deze 'dn' heeft geen geldige E-mail mogelijkheden."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "E-mail account verwijderen"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7350,13 +7358,13 @@ msgstr ""
 "Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "E-mail account aanmaken"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7365,7 +7373,7 @@ msgstr ""
 "Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -7373,25 +7381,25 @@ msgstr ""
 "Verwijder gedeelde map van mail-server zodra de invoer verwijderd wordt uit "
 "LDAP"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr "Verwijder gedeelde map en alle inhoud nadat dit account opgeslagen is"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Het toevoegen van een van uw eigen adressen aan de lijst met doorstuur "
 "adressen is niet logisch."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7403,114 +7411,114 @@ msgstr ""
 "U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
 "alternatieve adressen."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Unspecified"
 msgstr "niet gedefiniëerd"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 #, fuzzy
 msgid "Mails"
 msgstr "E-mail"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Tasks"
 msgstr "Taak"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Journals"
 msgstr "uren"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Contacten"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 #, fuzzy
 msgid "Notes"
 msgstr "Niet"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Inbox"
 msgstr "Index"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 #, fuzzy
 msgid "Drafts"
 msgstr "Datum"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Het verwijderen van de groeps E-mail instellingen is mislukt"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Het opslaan van de groep E-mail instellingen is mislukt"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Het vereiste veld 'Primair adres' is leeg."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Geef a.u.b. een geldig email adres op in het 'Primair adres' veld."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
 "afwijzen."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Kies a.u.b. geldige permissie instellingen. Standaard permissies kunnen niet "
 "leeg zijn."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Selecteer a.u.b. een geldig mailserver"
 
@@ -7536,11 +7544,11 @@ msgstr "Alternatieve adressen"
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7593,6 +7601,20 @@ msgstr "Algemene rechten"
 msgid "Member permission"
 msgstr "Groepslid rechten"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Geavanceerde E-mail opties"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en "
+"versturen"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Groepen beheer"
@@ -7973,68 +7995,68 @@ msgstr "Toon adressen van gebruiker"
 msgid "User name of which addresses are shown"
 msgstr "Gebruikersnaam van wie de adressen getoond worden"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "Afwezigheidsbericht sjablonen"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Scalix mail server"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "Mailbox klasse"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Server taal"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "Mailbox beheerder"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "Verberg gebruiker in Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "Mailbox grootte beperkingen"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Uitgaand limiet"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "Inkomend limiet"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Notificeer gebruiker"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Scalix E-mail adres"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Create/edit new task"
 msgstr "Maak nieuwe gebruiker aan"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Remove tasks"
 msgstr "Opties verwijderen"
@@ -9473,7 +9495,7 @@ msgid "Domain Name Service"
 msgstr "Tijd Service"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Domein"
 
@@ -9846,7 +9868,7 @@ msgstr "Verkeerd IP formaat in het veld IP adres"
 msgid "The required field 'MAC-address' is not set."
 msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9988,6 +10010,8 @@ msgstr "Selecteer een distributienaam"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 #, fuzzy
 msgid "seconds"
 msgstr "(in seconden)"
@@ -12182,6 +12206,15 @@ msgid "Number of listed windows workstations"
 msgstr "Toon Windows werkstations"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "standaard"
 
@@ -12718,21 +12751,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
 
@@ -12988,7 +13021,7 @@ msgstr ""
 "telefoon wachtrij aan te maken."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "Selecteer a.u.b. een geldig goFon locatie server."
 
@@ -13015,7 +13048,7 @@ msgstr "Er moet tenminste een wachtrijnummer gedefinieerd zijn."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -13057,8 +13090,8 @@ msgstr "MySQL zoekopdracht mislukt."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -14204,32 +14237,22 @@ msgstr ""
 "Het verwijderen van macro '%s' is mislukt. Controleer het GOsa logbestand "
 "voor de mysql fout."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "Meer dan een '(' wordt momenteel niet ondersteund. Regel '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "Meer dan een ')' wordt momenteel niet ondersteund. Regel: '%s'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "Er is geen programma opgegeven op regel; '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "Er is geen extensie type opgegeven in regel: '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Het invoegen van de nieuwe macro is mislukt voor server '%s'/"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
@@ -14237,28 +14260,28 @@ msgstr ""
 "Er moet tenminste een server met Asterisk database zijn om deze telefoon "
 "macro op te slaan."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "De opgegeven cn '%s' bestaat al."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "U moet de 'Display Naam' opgeven om deze macro op te slaan"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "De opgegeven cn is te lang om een Macro invoer te maken. Maximaal 20 "
 "karakters."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
@@ -14266,7 +14289,7 @@ msgstr ""
 "Deze macro is nog steeds in gebruik. Het is noodzakelijk deze macro als "
 "zichtbaar voor gebruikers in te stellen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
@@ -14274,7 +14297,7 @@ msgstr ""
 "Deze macro is nog steeds in gebruik. Om deze macro te kunnen verwijderen mag "
 "geen enkele gebruiker deze macro geselecteerd hebben."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
@@ -14282,15 +14305,15 @@ msgstr ""
 "Kan de macro niet uit de asterisk database verwijderen. Controleer uw "
 "asterisk database configuratie a.u.b."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Het verwijderen van de telefoonmacro is mislukt"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Het verwijder van telefoonmacro referenties is mislukt"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Het opslaan van de telefoonmacro is mislukt"
 
@@ -14355,7 +14378,7 @@ msgstr ""
 "Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14510,16 +14533,16 @@ msgstr ""
 "wijzigen van waardes om de verschillende databases consistent te houden. "
 "Controleer het GOsa logbestand voor de mysql fout."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Fout bij het uitvoeren van zoekopdracht:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "Dit account heeft geen telefoon mogelijkheden."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
@@ -14527,11 +14550,11 @@ msgstr ""
 "De macro die u geselecteerd heeft, is niet meer beschikbaar voor u. "
 "Selecteer a.u.b. een andere macro."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Verwijder telefoon account"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14539,12 +14562,12 @@ msgstr ""
 "Dit account heeft telefoon mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Telefoon account aanmaken"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14552,7 +14575,7 @@ msgstr ""
 "Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt ze niet "
 "inschakelen zolang geen uid ingesteld is."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14560,17 +14583,18 @@ msgstr ""
 "Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Kies uw privé telefoon"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -14578,11 +14602,11 @@ msgstr ""
 "Er moet tenminste een server met een asterisk database aanwezig zijn om een "
 "telefoon account aan te kunnen maken."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14590,7 +14614,7 @@ msgstr ""
 "De opgegeven Voicemail PIN-code bevat ongeldige karakters. Alleen nummerieke "
 "waardes zijn toegestaan."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14598,16 +14622,16 @@ msgstr ""
 "De opgegeven telefoon PIN-code bevat ongeldige karakters. Alleen "
 "alfanummerieke waardes zijn toegestaan."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "U dient tenminste één telefoonnummer op te geven!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Het opslaan van het telefoon account is mislukt"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14616,12 +14640,12 @@ msgstr ""
 "De MySQL Server '%s' is niet bereikbaar als gebruiker '%s'. Controleer het "
 "GOsa logbestand op mysql fouten."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Kan de database %s op %s niet selecteren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14629,16 +14653,16 @@ msgstr ""
 "Kan het telefoon account niet verwijderen. De MySQL extensie is niet "
 "aanwezig binnen uw PHP configuratie."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Gebruiker '%s' is van telefoonwachtrij '%s' verwijderd"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Het verwijderen van het telefoon account is mislukt"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -15343,18 +15367,18 @@ msgstr "GSM"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
 
@@ -15724,6 +15748,7 @@ msgid "hour"
 msgstr "uur"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "uren"
 
@@ -15913,120 +15938,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Januari"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Februari"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Maart"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "April"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Mei"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Juni"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Juli"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Augustus"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "September"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Oktober"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "November"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "December"
@@ -16145,20 +16170,6 @@ msgstr "naar map"
 msgid "Reject mails bigger than"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Geavanceerde E-mail opties"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en "
-"versturen"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Selecteer afdelingen"
@@ -16366,7 +16377,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
@@ -16376,8 +16387,8 @@ msgstr "Posix instellingen"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
@@ -16462,20 +16473,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Profielpad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Toegangsopties"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr "Gebruiker mag wachtwoord vanaf werkstation wijzigen"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "Inloggen op werkstation zonder wachtwoord"
 
@@ -16483,115 +16494,122 @@ msgstr "Inloggen op werkstation zonder wachtwoord"
 msgid "Temporary disable samba account"
 msgstr "Schakel het Samba/Windows account tijdelijk uit"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "Toon informatie"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "Header"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Schaduwen van andere sessie"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Sta inloggen op de Terminal Server toe"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Client configuratie voor initieel programma overnemen"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Initiëel programma"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Werkdirectory"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Terminal Service timeouts (in minuten)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Max. verbindingsduur"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Max. verbrekingsduur"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "Max. inactiviteitsduur"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Terminal Service client apparaten"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Verbindt client schijven bij inloggen"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Verbindt client printers bij inloggen"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Standaard printer als client printer"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "Bij verbroken verbinding of timeout"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Herstel sessie indien verbroken"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Blokkeer het Samba/Windows account"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Stel laatste inlogtijd in op"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Stel laatste uitlogtijd in op"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Account verloopt na"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Samba inlog tijden"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Instellingen bewerken"
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "Dit account heeft geen samba extensies."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Samba account verwijderen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16599,12 +16617,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:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Samba account aanmaken"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16612,7 +16630,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:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16620,55 +16638,80 @@ 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:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "invoer met notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "invoer zonder notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "geen invoer met notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "geen invoer zonder notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "verbreken"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "sluiten"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "vanaf elke client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "alleen vanaf vorige client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "Het nieuw opgegeven wachtwoord is te kort."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "De opgegeven wachtwoord verschil waarde is niet nummeriek."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Het verwijderen van het Samba account is mislukt"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Selecteer a.u.b. een geldig goFon locatie server."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Geef a.u.b. een waarde op voor het atribuut 'pad'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, 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:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, 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:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16676,7 +16719,7 @@ msgstr ""
 "Het Windows gebruikersbeheer programma staat slechts acht clients toe. U "
 "heeft er meer dan acht opgegeven."
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16684,7 +16727,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:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16692,10 +16735,146 @@ 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:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Het opslaan van het Samba account is mislukt"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Printer"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Vooraf"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Uit"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Omlaag"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "stel in"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Telefoon attributen "
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Minimale wachtwoord lengte"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Wachtwoord encryptie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Wachtwoord veranderen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "Maximale bestandsgrootte"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Beheerders wachtwoord"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Plaats"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Max. verbrekingsduur"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "actief, wachtwoord onveranderbaar"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Script attributen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Laatste aanmelding"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Login scripts"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Nieuw wachtwoord (opnieuw)"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Laatste aanmelding"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Laatste aanmelding"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatisch"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Wachtwoord verloopt op"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecteer de toe te voegen werkstations"
@@ -16844,48 +17023,48 @@ msgstr "ongeldig"
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Kerberos database communicatie is mislukt"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
 "'Basis'."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Het vereiste veld 'Inlog naam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -16893,7 +17072,7 @@ msgstr ""
 "Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
 "de database."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16901,11 +17080,11 @@ msgstr ""
 "Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
 "liggende streepjes zijn toegestaan."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Het veld 'Website' bevat een ongeldige URL."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
@@ -16978,11 +17157,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Bewerk eigenschappen"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Laatste aanmelding"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Organisatie informatie"
@@ -18151,6 +18325,18 @@ msgstr "Beperk proxy gebruik met quota"
 msgid "per"
 msgstr "per"
 
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr "Meer dan een '(' wordt momenteel niet ondersteund. Regel '%s'."
+
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr "Meer dan een ')' wordt momenteel niet ondersteund. Regel: '%s'."
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Stel laatste inlogtijd in op"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Stel laatste uitlogtijd in op"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "U probeert een ongeldig E-mail adres toe te voegen"
 
diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po
index 7e5997676..54e49a338 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: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2008-06-12 01:28+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -173,7 +173,7 @@ msgstr "Zależności"
 msgid "Options"
 msgstr "Opcje"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parametr"
 
@@ -201,6 +201,7 @@ msgstr "Urządzenia"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Informacja"
 
@@ -1585,6 +1586,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Wyłączone"
 
@@ -1683,6 +1686,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Wyszukaj 'expose_php' w pliku php.ini i ustaw na 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "Włączone"
 
@@ -2170,7 +2174,10 @@ msgstr "Typ pocztowy"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "wyłączone"
 
@@ -3300,7 +3307,7 @@ msgstr "Wymagane"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Zatrzymaj"
 
@@ -3308,7 +3315,7 @@ msgstr "Zatrzymaj"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Treść autorespondera"
@@ -3447,7 +3454,7 @@ msgstr "Pełen adres"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "Domyślne"
 
@@ -3660,6 +3667,7 @@ msgid "Release interval"
 msgstr "Interwał czasowy"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -3921,7 +3929,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -3969,7 +3977,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5032,8 +5040,8 @@ msgstr "Zachowaj"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5327,13 +5335,13 @@ msgstr "Wybierz zmienną do usunięcia lub edycji"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5384,7 +5392,7 @@ msgstr "Wybierz zmienną do usunięcia lub edycji"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6550,7 +6558,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "Brak uprawnień do usunięcia tego użytkownika!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6559,13 +6567,13 @@ msgstr "żaden"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Wymagane pole 'Podana nazwa' jest puste."
 
@@ -7160,48 +7168,48 @@ msgstr "Wartość podana jako 'GID' jest za mała."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "Nie ma takiego trybu poczty '%s' podanego w Twoim pliku gosa.conf."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "czytanie"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "wysyłanie"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "wysyłanie zewnętrzne"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "dołączanie"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "zapisywanie"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "admin"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Podany 'dn' nie posiada prawidłowych rozszerzeń Pocztowych."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Usuń konto pocztowe"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7209,13 +7217,13 @@ msgid ""
 msgstr ""
 "To konto posiada rozszerzenia poczty. Można je wyłączyć klikając poniżej."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Stwórz konto pocztowe"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7223,28 +7231,28 @@ msgid ""
 msgstr ""
 "To konto nie posiada rozszerzenia poczty. Można je włączyć klikając poniżej."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Dodawanie swojego własnego adresu do przekierowanych nie ma sensu."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7255,109 +7263,109 @@ msgid ""
 msgstr ""
 "Próbujesz dodać nieprawidłowy adres email do listy adresów alternatywnych."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr "Adres który próbujesz dodać jest już używany"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr "Niezdefiniowane"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 #, fuzzy
 msgid "Mails"
 msgstr "Poczta"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Tasks"
 msgstr "Zadanie"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Journals"
 msgstr "godzin"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 #, fuzzy
 msgid "Notes"
 msgstr "Nie"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Inbox"
 msgstr "Indeks"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 #, fuzzy
 msgid "Drafts"
 msgstr "Data"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Usuwanie ustawień poczty grupy nieudane"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Zapisywanie ustawień poczty grupy nieudane"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Wymaganie pole 'Podstawowy adres' jest puste."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Proszę podać prawidłowy adres email w polu 'Podstawowy adres'."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "Podstawowy adres który podano jest już w użyciu."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "Wartość 'Rozmiar Quota' jest nieprawidłowa"
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Proszę podać prawidłowy rozmiar poczty która ma być odrzucana."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Proszę wybrać prawidłowe ustawienia. Domyślne ustawienia nie mogą być puste."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Proszę wybrać prawidłowy serwer pocztowy."
 
@@ -7383,11 +7391,11 @@ msgstr "Adresy alternatywne"
 msgid "List of alternative mail addresses"
 msgstr "Lista alternatywnych adresów pocztowych"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Przekaż wiadomości do członków bez grupy"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7439,6 +7447,19 @@ msgstr "Domyślne uprawnienia"
 msgid "Member permission"
 msgstr "Uprawnienia członków"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Zaawansowane opcje poczty"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Wybierz jeśli użytkownik może odbierać i wysyłać w obrębie własnej domeny"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Administracja Grupą"
@@ -7813,69 +7834,69 @@ msgstr "Wyświetl adresy użytkowników"
 msgid "User name of which addresses are shown"
 msgstr "Nazwa użytkownika którego adresy są pokazane"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 msgid "Enable vacation message"
 msgstr "Włącz autoresponder"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "Szablony autorespondera"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Węzeł pocztowy Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 #, fuzzy
 msgid "Mailbox class"
 msgstr "Adres email"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Język serwera"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Administrator"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 #, fuzzy
 msgid "Mailbox administrator"
 msgstr "Administratorzy foldera"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 #, fuzzy
 msgid "Mailbox size limitations"
 msgstr "Ustawienia pocztowe"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Ogranicz wychodzące"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Powiadom użytkownika"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Adres email Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr "Utwórz/ zmień zadanie"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr "Usuń zadanie"
 
@@ -9283,7 +9304,7 @@ msgid "Domain Name Service"
 msgstr "Usługa czasu"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Domena"
 
@@ -9649,7 +9670,7 @@ msgstr "Zły format danych w polu 'adres-IP'"
 msgid "The required field 'MAC-address' is not set."
 msgstr "Wymagane pole 'MAC-adres' nie jest wypełnione"
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9786,6 +9807,8 @@ msgstr "Wybierz nazwę wydania"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 msgid "seconds"
 msgstr "sekund"
 
@@ -11908,6 +11931,15 @@ msgid "Number of listed windows workstations"
 msgstr "Pokaż stacje robocze windows"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "domyślny"
 
@@ -12427,21 +12459,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Pole 'Telefon' zawiera nieprawidłowy numer telefonu."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Pole 'Fax' zawiera nieprawidłowy numer telefonu."
 
@@ -12691,7 +12723,7 @@ msgid ""
 msgstr "Musi być wybrany co najmniej jeden serwer NTP."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 #, fuzzy
 msgid "Please select a valid goFonHomeServer."
 msgstr "Proszę wybrać prawidłowy serwer pocztowy."
@@ -12719,7 +12751,7 @@ msgstr "Musi być zdefiniowany co najmniej jeden numer kolejki."
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12760,8 +12792,8 @@ msgstr "Zapytanie do MySQL nieudane."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -13888,36 +13920,22 @@ msgstr ""
 "Serwer MySQL '%s' nie jest dostępny dla użytkownika '%s', sprawdź log GOsa "
 "dla błedu mysql."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, fuzzy, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr ""
-"Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
-"skontaktować się z zespołem GOsa."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, fuzzy, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr ""
-"Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
-"skontaktować się z zespołem GOsa."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, fuzzy, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "Istnieje duplikat w '%s' dla '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, fuzzy, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Logowanie użytkownika nieudane, odpowiedź serwera LDAP '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to save this "
@@ -13926,26 +13944,26 @@ msgstr ""
 "Musi być zaznaczony co najmniej jeden serwer NTP lub zaznaczony tryb "
 "dziedziczenia."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Podane cn '%s' już istnieje."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "Należy podać 'Nazwa wyświetlana' aby zapisać to makro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Podane cn jest zbyt długie aby utworzyć wpis Makro, maksimum 20 znaków."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr "Brak uprawnień do zmian atrybutu '%s' w goFonMacro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 #, fuzzy
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
@@ -13954,7 +13972,7 @@ msgstr ""
 "To makro jest wciąż używane. Aby je usunąć upewnij się że nikt nie zaznaczył "
 "tego Makra."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 #, fuzzy
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
@@ -13963,7 +13981,7 @@ msgstr ""
 "To makro jest wciąż używane. Aby je usunąć upewnij się że nikt nie zaznaczył "
 "tego Makra."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 #, fuzzy
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
@@ -13972,15 +13990,15 @@ msgstr ""
 "OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
 "parametry konfiguracji."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Usuwanie makra telefonicznego nieudane"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Usuwanie referencji makra telefonicznego nieudane"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Zapisywanie makra telefonicznego nieudane"
 
@@ -14044,7 +14062,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr "Brak uprawnień do zmian atrybutu '%s' w goFonMacro."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14190,38 +14208,38 @@ msgstr ""
 "Serwer MySQL '%s' nie jest dostępny dla użytkownika '%s', sprawdź log GOsa "
 "dla błedu mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Błąd podczas wykonywania zapytania:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "To konto nie posiada rozszerzeń telefonu."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr "Makro które wybrano nie jest już dostępne, proszę wybrać inne."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Usuń konto telefoniczne"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 "To konto ma włączone cechy telefonu. Można je wyłączyć klikając poniżej."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Utwórz konto telefoniczne"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14229,24 +14247,25 @@ msgstr ""
 "To konto posiada wyłączone rozszerzenia telefonu. Nie można włączyć tego "
 "rozszerzenia dopóki nie jest ustawiony uid."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 "To konto ma wyłączone cechy telefonu. Można je włączyć klikając poniżej."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Wybierz swój telefon prywatny"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -14255,18 +14274,18 @@ msgstr ""
 "Musi być zaznaczony co najmniej jeden serwer NTP lub zaznaczony tryb "
 "dziedziczenia."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 "Podany PIN Voicemail zawiera niedozwolone znaki, tylko cyfry są dozwolone."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14274,16 +14293,16 @@ msgstr ""
 "Podany PIN telefonu zawiera niedozwolone znaki, tylko znaki alfanumeryczne "
 "są dozwolone."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Musisz podac co najmniej jeden numer telefonu!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Zapisywanie konta telefonicznego nieudane"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14292,12 +14311,12 @@ msgstr ""
 "Serwer MySQL '%s' nie jest dostępny dla użytkownika '%s', sprawdź log GOsa "
 "dla błedu mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Nie można wybrać bazy %s na %s."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14305,16 +14324,16 @@ msgstr ""
 "Nie można usunąć konta telefonicznego. Brak wsparcia dla mysql w "
 "ustawieniach php."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Usunięto użytkownika '%s' z kolejki telefonicznej '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Usuwanie konta telefonicznego nieudane"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -14984,18 +15003,18 @@ msgstr "Numer telefonu komórkowego"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Pole 'Podana nazwa' zawiera niedozwolone znaki."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Pole 'Komórka' zawiera nieprawidłowy numer telefonu."
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Pole 'Pager' zawiera nieprawidłowy numer telefonu."
 
@@ -15356,6 +15375,7 @@ msgid "hour"
 msgstr "godzina"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "godzin"
 
@@ -15541,120 +15561,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Styczeń"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Luty"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Marzec"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "Kwiecień"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Maj"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Czerwiec"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Lipiec"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Sierpień"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "Wrzesień"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Październik"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "Listopad"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "Grudzień"
@@ -15767,19 +15787,6 @@ msgstr "do folferu"
 msgid "Reject mails bigger than"
 msgstr "Odrzuć pocztę większą niż"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Zaawansowane opcje poczty"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Wybierz jeśli użytkownik może odbierać i wysyłać w obrębie własnej domeny"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Wybierz departament"
@@ -15980,7 +15987,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "Hasło wygasa"
 
@@ -15990,8 +15997,8 @@ msgstr "Ustawienia Posix"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Katalog domowy"
 
@@ -16076,20 +16083,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Ścieżka do profilu"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Opcje dostępu"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 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:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "Logowanie z klienta windows nie wymaga hasła"
 
@@ -16097,134 +16104,141 @@ msgstr "Logowanie z klienta windows nie wymaga hasła"
 msgid "Temporary disable samba account"
 msgstr "Tymczasowo wyłącz konto samba"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "pokaż informacje"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "Nagłówek"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Shadowing"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Zezwól na logowanie do serwera terminali"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Odziedzicz konfigurację klienta"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Program pierwotny"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Katalog roboczy"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Ustawienia Timeoutu (w minutach)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Połączenie"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Rozłączenie"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "BEZCZYNNY"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Urządzenia klienta"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Podłącz dyski klienta przy logowaniu"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Podłącz drukarki klienta przy logowaniu"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Ustaw główną drukarkę klienta jako domyślną"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Shadowing"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "Przy rozłączeniu lub timeoucie"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "Połącz jeśli rozłączono"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Ogranicz czas logowania"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Ogranicz czas wylogowania"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Konto wygasa po"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Czasy logowań Samba"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Zmień ustawienia..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Zezwól na połączenia tylko z tych stacji"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "To konto nie posiada rozszerzeń samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Usuń konto samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 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:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Stwórz konto samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 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:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16232,48 +16246,73 @@ 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:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "input tak, notify tak"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "input tak, notify nie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "input nie, notify nie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "rozłącz"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "resetuj"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "z każdego klienta"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "tylko z poprzedniego klienta"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "Hasło podane jako nowe jest za krótkie."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "Podana wartość różnicy hasła nie jest liczbą."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Usuwanie konta Samba nieudane"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Proszę wybrać prawidłowy serwer pocztowy."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Proszę podać wartość dla atrybutu 'ścieżka'."
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, 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:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -16281,14 +16320,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:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 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:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16296,7 +16335,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:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16304,10 +16343,146 @@ 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:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Zapisywanie konta Samba nieudane"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Minuta"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Przed"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Wyłączone"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "W dół"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "ustaw"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Atrybuty telefonu"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Minimalna długość hasła"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Przechowywanie hasła"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Zmiana hasła"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "Maksymalny rozmiar pliku"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Hasło Administratora"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Lokalizacja"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Rozłączenie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "aktywne, hasło niezmienialne"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Atrybuty skryptu"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Ostatnie logowanie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Skrypty logowania"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Nowe hasło powtórzone"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Ostatnie logowanie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Ostatnie logowanie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatyczne"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Hasło wygasa"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Brak uprawnień do zmiay hasła"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Wybierz stacje robocze do dodania"
@@ -16450,51 +16625,51 @@ msgstr "nieprawidłowy"
 msgid "No certificate installed"
 msgstr "Brak zainstalowanych certyfikatów"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Usuwanie konta ogólnego użytkownika nieudane"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Komunikacja z bazą Kerberos nieudana"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Nie można usunąć użytkownika z bazy Kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Zapisywanie konta ogólnego użytkownika nieudane"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "nie można dodać użytkownika do bazy Kerberos."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "Brak uprawnień do tworzenia konta w tym 'Kontenerze'."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "Brak uprawnień do przenoszenia konta z obecnego 'Kontenera'."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Już istnieje osoba z takim samym loginem w bazie."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Wymagane pole 'Login' jest puste."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr "Już istnieje osoba z tą 'Nazwą'/'Podaną nazwą' w bazie."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16502,11 +16677,11 @@ msgstr ""
 "Pole 'Login' zawiera niedozwolone znaki. Tylko małe litery, liczny i "
 "myślniki są dozwolone."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Pole 'Strona WWW' zawiera niepoprawną definicję URL."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
@@ -16579,11 +16754,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Edytuj właściwości"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Ostatnie logowanie"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
@@ -17740,6 +17910,24 @@ msgstr "Ogranicz użycie proxy mechanizmami quota"
 msgid "per"
 msgstr "na"
 
+#, fuzzy
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr ""
+#~ "Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
+#~ "skontaktować się z zespołem GOsa."
+
+#, fuzzy
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr ""
+#~ "Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
+#~ "skontaktować się z zespołem GOsa."
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Ogranicz czas logowania"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Ogranicz czas wylogowania"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "Próbujesz dodać nieprawidłowy adres email"
 
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 1b6193c1b..c42a6a054 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: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-09-20 11:00+0300\n"
 "Last-Translator: Vitaly Kuznetsov <vitty@altlinux.ru>\n"
 "Language-Team: ALT Linux Team\n"
@@ -175,7 +175,7 @@ msgstr "Ссылки"
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Параметр"
 
@@ -203,6 +203,7 @@ msgstr "Устройства"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Информация"
 
@@ -1582,6 +1583,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Выключено"
 
@@ -1681,6 +1684,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Найти 'expose_php' в вашем php.ini и установить его в 'Off'."
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "Включено"
 
@@ -2173,7 +2177,10 @@ msgstr "Почтовый метод"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "отключен"
 
@@ -3337,7 +3344,7 @@ msgstr "Требуется"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Остановка"
 
@@ -3345,7 +3352,7 @@ msgstr "Остановка"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
@@ -3483,7 +3490,7 @@ msgstr "Полный адрес"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -3686,6 +3693,7 @@ msgid "Release interval"
 msgstr "Интервал выпуска"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -3942,7 +3950,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -3990,7 +3998,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -5063,8 +5071,8 @@ msgstr "Сохранять"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5352,13 +5360,13 @@ msgstr "Выберите переменную для редактировани
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5409,7 +5417,7 @@ msgstr "Выберите переменную для редактировани
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6570,7 +6578,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6579,13 +6587,13 @@ msgstr "нет"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
@@ -7169,48 +7177,48 @@ msgstr "Значение 'GID' слишком маленькое."
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "Слишком много групп, невозможно создать идентификатор!"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "Метод '%s' не описан в вашем файле конфигурации."
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "чтение"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "отправка"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "отправка (внешн.)"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "добавление"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "запись"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "администратор"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Для этого DN нет корректных почтовых расширений."
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -7219,13 +7227,13 @@ msgstr ""
 "В этой учетной записи есть настройки электронной почты. Вы можете удалить "
 "их, щелкнув ниже."
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "Создать настройки запись эл. почты"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -7234,19 +7242,19 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 "Удалить общие папки из БД почтового сервера когда объект будет удалён из LDAP"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Удалить общую папку и всё её содержимое после сохранения этой учётной записи"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
@@ -7254,13 +7262,13 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Добавление своего единственного адреса к списку пересылки не имеет смысла."
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7272,103 +7280,103 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку "
 "альтернативных адресов."
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr "Не определен"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Mails"
 msgstr "Сообщения"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Tasks"
 msgstr "Забачи"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Journals"
 msgstr "Журналы"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Контакты"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "Notes"
 msgstr "Записи"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Inbox"
 msgstr "Входящие"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Drafts"
 msgstr "Черновики"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr "Отправленные"
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr "Спам"
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "Не удалось удалить почтовые настройки группы"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "Не удалось сохранить настройки почтовой группы"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "Введенный вами адрес уже используется."
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Проверьте права доступа. Права доступа по умолчанию не могут быть пустыми."
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "Выберите корректный почтовый сервер"
 
@@ -7394,11 +7402,11 @@ msgstr "Альтернативные адреса"
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7450,6 +7458,20 @@ msgstr "Права по умолчанию"
 msgid "Member permission"
 msgstr "Права для членов группы"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "Дополнительные почтовые настройки"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+"Выберите, может ли пользователь отправлять и получать сообщения только "
+"внутри своего домена"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "Пользователь может отправлять и получать почту только локально"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Управление группами"
@@ -7829,67 +7851,67 @@ msgstr "Показать адреса пользователя"
 msgid "User name of which addresses are shown"
 msgstr "Имя пользователя, адрес которого показан"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "Включить автоответчик"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "Шаблон автоответчика"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Узел почты Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "Класс почтовой папки"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Язык сервера"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Администратор"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "Администратор почтовой папки"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "Спрятать пользователя в Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "Ограничение размера почтовой папки"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "Ограничить исходящие"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "Ограничить входящие"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "Уведомить пользователя"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Адрес email Scalix"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Create/edit new task"
 msgstr "Создать/редактировать новое задание"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 msgid "Remove tasks"
 msgstr "Удалить задания"
 
@@ -9281,7 +9303,7 @@ msgid "Domain Name Service"
 msgstr "Сервис доменных имён"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Домен"
 
@@ -9647,7 +9669,7 @@ msgstr "Неверный формат IP в поле IP-адрес"
 msgid "The required field 'MAC-address' is not set."
 msgstr "Обязательное поле 'MAC-адрес' не заполнено."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9779,6 +9801,8 @@ msgstr "Время lease по умолчанию"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 msgid "seconds"
 msgstr "секунды"
 
@@ -11873,6 +11897,15 @@ msgid "Number of listed windows workstations"
 msgstr "Число отображенных рабочих станций windows"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "по умолчанию"
 
@@ -12387,21 +12420,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
 
@@ -12656,7 +12689,7 @@ msgstr ""
 "телефонной очереди."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "Введите корректный goFonHomeServer."
 
@@ -12683,7 +12716,7 @@ msgstr "Должен быть определён по крайней мере о
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12725,8 +12758,8 @@ msgstr "Не удался запрос mysql."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -13867,32 +13900,22 @@ msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 "Не удалось удалить макрос в '%s'. Проверьте лог GOsa на предмет ошибки Mysql."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "Более одной '(' в настоящее время не поддерживается. Строка : '%s'"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "Более одной ')' в настоящее время не поддерживается. Строка : '%s'"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "В данной строке нет приложения : '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "Не указан тип расширения в строке : '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "Невозможно вставить новый макрос для сервера '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
@@ -13900,55 +13923,55 @@ msgstr ""
 "Должен быть как минимум один сервер с БД asterisk для сохранения телефонного "
 "макроса."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Указаный cn '%s' уже существует."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "Вы должны указать 'Display Name' для сохранения макроса"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Данный cn слишком длинный, для создания макроса, максимально 20 символов."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr "Недостаточно прав, невозможно сменить тип атрибута '%s' в goFonMacro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
 msgstr ""
 "Макрос используется. Это неодходимо для отметки как видимый для пользователя."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr ""
 "Макро используется. Для удаления удостоверьтесь что никто его не выбрал."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr ""
 "Не удаётся удалить макрос из БД asterisk. Проверьте конфигурацию БД asterisk."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "Не удалось удалить телефонный макрос"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "Не удалось удалить ссылки телефонного макроса"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "Не удалось сохранить телефонный макрос"
 
@@ -14012,7 +14035,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr "Недостаточно прав, невозможно изменить атрибут '%s' в goFonMacro."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14164,26 +14187,26 @@ msgstr ""
 "изменений для сохранения БД в консистентном состояния, проверьте лог GOsa на "
 "предмет ошибки mysql."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "Ошибка при обработке запроса:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "В этой учетной записи нет атрибутов для телефона."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr "Выбраный макрос недоступен для вас, пожалуйста выберите другой."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -14191,12 +14214,12 @@ msgstr ""
 "В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -14204,7 +14227,7 @@ msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы не можете включить "
 "их пока не задан uid."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -14212,17 +14235,18 @@ msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "Укажите личный телефон"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -14230,11 +14254,11 @@ msgstr ""
 "Для создания учётной записи телефона должен быть по крайней мере один сервер "
 "с БД asterisk ."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "PIN голосовой почты должен быть длиной 1-4 символа."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -14242,7 +14266,7 @@ msgstr ""
 "Значение поля PIN голосовой почты содержит недопустимые символы. Допустимыми "
 "являются цифры ."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -14250,16 +14274,16 @@ msgstr ""
 "Значение поля Телефонный PIN содержит недопустимые символы. Допустимыми "
 "являются буквы и цифры ."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "Не удалось сохранить учётную запись телефона"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -14268,12 +14292,12 @@ msgstr ""
 "MySQL сервер '%s' недоступен для пользователя '%s', проверьте лог GOsa на "
 "предмет ошибки mysql"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Невозможно выбрать базу данных %s на %s!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
@@ -14281,16 +14305,16 @@ msgstr ""
 "Невозможно удалить учётную запись телефона, расширение mysql не  существует "
 "в текущей конфигурации."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Удалить пользователя '%s' из телефонной очереди '%s'."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "Н удалось удалить учётную запись телефона"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -14956,18 +14980,18 @@ msgstr "Сотовый телефон"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
 
@@ -15326,6 +15350,7 @@ msgid "hour"
 msgstr "час"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "часов"
 
@@ -15513,120 +15538,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Январь"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Февраль"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Март"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "Апрель"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Май"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Июнь"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Июль"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Август"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "Сентябрь"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Октябрь"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "Ноябрь"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "Декабрь"
@@ -15740,20 +15765,6 @@ msgstr "в папку"
 msgid "Reject mails bigger than"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "Дополнительные почтовые настройки"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-"Выберите, может ли пользователь отправлять и получать сообщения только "
-"внутри своего домена"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "Пользователь может отправлять и получать почту только локально"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Выберите подразделение"
@@ -15964,7 +15975,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
@@ -15974,8 +15985,8 @@ msgstr "Атрибуты Posix"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Домашний каталог"
 
@@ -16061,20 +16072,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "Параметры доступа"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
@@ -16082,115 +16093,122 @@ msgstr "Не спрашивать пароль при входе в систем
 msgid "Temporary disable samba account"
 msgstr "Временно отключить учетную запись Samba"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "показать информацию"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "заголовок"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Затенение"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "Начальная программа"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Рабочий каталог"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "Подключение"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "Отключение"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "Простой"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "Клиентские устройства"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "Подключить клиентские устройства при входе"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "Подключить клиентские принтеры при входе"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "Указать принтер по умолчанию"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Затенение"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "При обрыве или таймауте"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "В"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "Заблокировать учётную запись Samba"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "Ограничение времени Logon"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "Ограничение времени Logoff"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "Учётная запись истекает после"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Времена входа в Samba"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Редактировать настройки..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "В этой учетной записи нет расширений Samba."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -16198,12 +16216,12 @@ msgstr ""
 "В этой учетной записи есть настройки Samba. Вы можете отключить их, щелкнув "
 "ниже."
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "Создать учетную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -16211,7 +16229,7 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Вы можете включить их, щелкнув "
 "ниже."
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -16219,54 +16237,79 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
 "атрибуты POSIX, включите сначала их использование."
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "отключиться"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "сброс"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "Новый пароль слишком короткий."
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "Различия в вводимом пароле должно быть числовым."
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "Не удалось удалить учётную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Введите корректный goFonHomeServer."
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Укажите корректное значение атрибута 'путь'"
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Значение '%s' содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr "Значение таймаута '%s' пустое или содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -16274,7 +16317,7 @@ msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -16282,7 +16325,7 @@ msgstr ""
 "Внимание: этот аккаунт имеет неправильный SID. Это нельзя исправить "
 "средствами GOsa."
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -16290,10 +16333,146 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "Не удалось сохранить учётную запись Samba"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Минута"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "До"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Выключено"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Вниз"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "установить"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Атрибут телефона"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Минимальная длина пароля"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Хэширование паролей"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Смена пароля"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "Максимальное время lease"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "Пароль администратора"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Местоположение"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Отключение"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "активный, пароль не меняется"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Атрибуты скрипта"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Последний вход в систему"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "Скрипт Logon"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Повтор нового пароля"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Последний вход в систему"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Последний вход в систему"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Автоматический"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Срок действия пароля истекает"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Смена пароля не разрешена"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Выберите рабочие станции для добавления"
@@ -16441,46 +16620,46 @@ msgstr "неправильный"
 msgid "No certificate installed"
 msgstr "Сертификаты не установлены"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "Удаление общей пользовательской учётной записи отключено."
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "Не удалось сохранить общую пользовательскую учётную запись"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "У вас недостаточно прав для перемещения пользователя из этой 'Ветви'."
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -16488,7 +16667,7 @@ msgstr ""
 "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
 "существует."
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -16496,11 +16675,11 @@ msgstr ""
 "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
 "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "Невозможно открыть указаный сертификат!"
 
@@ -16573,11 +16752,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Изменить свойства"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Последний вход в систему"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "Информация об организации"
@@ -17733,6 +17907,18 @@ msgstr "Ограничить квотой использование прокс
 msgid "per"
 msgstr "per"
 
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr "Более одной '(' в настоящее время не поддерживается. Строка : '%s'"
+
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr "Более одной ')' в настоящее время не поддерживается. Строка : '%s'"
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "Ограничение времени Logon"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "Ограничение времени Logoff"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "Вы пытаетесь добавить некорректный адрес электронной почты "
 
diff --git a/locale/sv/LC_MESSAGES/messages.po b/locale/sv/LC_MESSAGES/messages.po
index 09e4d5715..71b09f4b8 100644
--- a/locale/sv/LC_MESSAGES/messages.po
+++ b/locale/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gosa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-07-31 19:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -174,7 +174,7 @@ msgstr "Referenser"
 msgid "Options"
 msgstr "Alternativ"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -202,6 +202,7 @@ msgstr "Enheter"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "Information"
 
@@ -1513,6 +1514,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "Av"
 
@@ -1594,6 +1597,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "PÃ¥"
 
@@ -2063,7 +2067,10 @@ msgstr ""
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "inaktiverad"
 
@@ -3175,7 +3182,7 @@ msgstr ""
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "Stoppa"
 
@@ -3183,7 +3190,7 @@ msgstr "Stoppa"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr ""
@@ -3321,7 +3328,7 @@ msgstr ""
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "Standard"
 
@@ -3524,6 +3531,7 @@ msgid "Release interval"
 msgstr ""
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -3769,7 +3777,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -3817,7 +3825,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -4818,8 +4826,8 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5102,13 +5110,13 @@ msgstr ""
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5159,7 +5167,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6280,7 +6288,7 @@ msgid "You are not allowed to delete this user!"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6289,13 +6297,13 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -6865,89 +6873,89 @@ msgstr ""
 msgid "Too many groups, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -6957,108 +6965,108 @@ msgid ""
 "addresses."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Unspecified"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 #, fuzzy
 msgid "Mails"
 msgstr "E-post"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Tasks"
 msgstr "klass"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Journals"
 msgstr "timmar"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 #, fuzzy
 msgid "Notes"
 msgstr "Innehåll"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Inbox"
 msgstr "Index"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 #, fuzzy
 msgid "Drafts"
 msgstr "Datum"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -7084,11 +7092,11 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7141,6 +7149,18 @@ msgstr ""
 msgid "Member permission"
 msgstr ""
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr ""
@@ -7505,67 +7525,67 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "Ta bort det här meddelandet"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 msgid "Vacation start/stop"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "Serverspråk"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "Administratör"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Create/edit new task"
 msgstr "Skapa ny användare"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Remove tasks"
 msgstr "Ta bort"
@@ -8939,7 +8959,7 @@ msgid "Domain Name Service"
 msgstr "Tidstjänst"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "Domän"
 
@@ -9299,7 +9319,7 @@ msgstr ""
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9432,6 +9452,8 @@ msgstr "Standardvärde"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 #, fuzzy
 msgid "seconds"
 msgstr "(i sekunder)"
@@ -11461,6 +11483,15 @@ msgid "Number of listed windows workstations"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "standard"
 
@@ -11961,21 +11992,21 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -12204,7 +12235,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr ""
 
@@ -12231,7 +12262,7 @@ msgstr ""
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12268,8 +12299,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -13372,83 +13403,73 @@ msgstr ""
 msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 #, fuzzy
 msgid "Removing phone macro failed"
 msgstr "Ta bort makron"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr ""
 
@@ -13509,7 +13530,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -13646,117 +13667,118 @@ msgid ""
 "entries to keep the database consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -14425,18 +14447,18 @@ msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
@@ -14773,6 +14795,7 @@ msgid "hour"
 msgstr "timme"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "timmar"
 
@@ -14953,120 +14976,120 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "Januari"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "Februari"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "Mars"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "April"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "Maj"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "Juni"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "Juli"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "Augusti"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "September"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "Oktober"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "November"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "December"
@@ -15176,18 +15199,6 @@ msgstr "till mapp"
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr ""
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr ""
@@ -15382,7 +15393,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr ""
 
@@ -15392,8 +15403,8 @@ msgstr ""
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "Hemkatalog"
 
@@ -15478,20 +15489,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Profilsökväg"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -15499,206 +15510,369 @@ msgstr ""
 msgid "Temporary disable samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "visa information"
+
+#: plugins/personal/samba/samba3.tpl:61
+msgid "Hide"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:63
+msgid "Show"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "Terminalserver"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "Arbetskatalog"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr ""
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr ""
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "Redigera inställningar..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "Ange ett giltigt användarnamn!"
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "Ange ett giltigt användarnamn!"
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 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:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "Skrivare"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "Uppdatera"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "Av"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "Ikon"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "Skicka"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "Mallattribut"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "Lösenordsinställningar"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "Lösenord"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "Nytt lösenord"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+msgid "Maximum password age"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+msgid "Minimum password age"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "Plats"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "Anslutningsmetod"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "Repetera nytt lösenord"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "Mallattribut"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "Efternamn"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+msgid "Logon attempts"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "Ange lösenord"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "Efternamn"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "Efternamn"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "Automatisk"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "Lösenordsinställningar"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "Lösenord (igen)"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -15834,61 +16008,61 @@ msgstr "ogiltigt"
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -15961,11 +16135,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "Redigera egenskaper"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "Efternamn"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr ""
diff --git a/locale/zh/LC_MESSAGES/messages.po b/locale/zh/LC_MESSAGES/messages.po
index 322c62c7a..4cf8a1584 100644
--- a/locale/zh/LC_MESSAGES/messages.po
+++ b/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-26 16:19+0100\n"
+"POT-Creation-Date: 2009-04-06 19:12+0200\n"
 "PO-Revision-Date: 2007-07-11 18:45+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -175,7 +175,7 @@ msgstr "引用"
 msgid "Options"
 msgstr "选项"
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:937
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:935
 msgid "Parameter"
 msgstr "参数"
 
@@ -203,6 +203,7 @@ msgstr "设备"
 #: plugins/gofax/blocklists/generic.tpl:75 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/personal/samba/samba3.tpl:56
 msgid "Information"
 msgstr "提示信息"
 
@@ -1533,6 +1534,8 @@ msgstr ""
 #: setup/class_setupStep_Checks.inc:191 setup/class_setupStep_Checks.inc:210
 #: setup/class_setupStep_Checks.inc:226 setup/class_setupStep_Checks.inc:242
 #: setup/class_setupStep_Checks.inc:259
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
 msgid "Off"
 msgstr "关"
 
@@ -1621,6 +1624,7 @@ msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "在您的 php.ini 中查找 'expose_php'，并设置它为关闭。"
 
 #: setup/class_setupStep_Checks.inc:250
+#: plugins/personal/samba/class_sambaAccount.inc:1290
 msgid "On"
 msgstr "开"
 
@@ -2105,7 +2109,10 @@ msgstr "邮件方法"
 #: setup/setup_config2.tpl:187
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/personal/posix/class_posixAccount.inc:558
-#: plugins/personal/samba/class_sambaAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1321
 msgid "disabled"
 msgstr "禁用"
 
@@ -3239,7 +3246,7 @@ msgstr "需要的"
 #: include/sieve/class_sieveManagement.inc:734
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1404
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1402
 msgid "Stop"
 msgstr "停止"
 
@@ -3247,7 +3254,7 @@ msgstr "停止"
 #: include/sieve/class_sieveManagement.inc:735
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/templates/object_container.tpl:31
-#: plugins/admin/groups/acl_definition.inc:261
+#: plugins/admin/groups/acl_definition.inc:262
 #: plugins/personal/mail/generic.tpl:196
 msgid "Vacation message"
 msgstr "假期信息"
@@ -3385,7 +3392,7 @@ msgstr "完整地址"
 
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
-#: plugins/admin/groups/class_groupMail.inc:624
+#: plugins/admin/groups/class_groupMail.inc:626
 msgid "Default"
 msgstr "缺省"
 
@@ -3588,6 +3595,7 @@ msgid "Release interval"
 msgstr "发行间隔"
 
 #: include/sieve/templates/element_vacation.tpl:25
+#: plugins/personal/samba/class_sambaAccount.inc:1410
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
@@ -3835,7 +3843,7 @@ msgstr ""
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
-#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/mail.tpl:127 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
@@ -3883,7 +3891,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/samba/samba3.tpl:337
 #: plugins/personal/scalix/generic.tpl:90
 #: plugins/personal/environment/environment.tpl:150
 #: plugins/personal/environment/environment.tpl:178
@@ -4903,8 +4911,8 @@ msgstr "保留"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
 #: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/groups/class_groupMail.inc:582
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/groups/class_groupMail.inc:584
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:444
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -5187,13 +5195,13 @@ msgstr "选择一个要删除或修改的变量"
 #: plugins/admin/mimetypes/generic.tpl:92
 #: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:589
+#: plugins/admin/groups/class_groupMail.inc:591
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/groups/mail.tpl:69
-#: plugins/admin/groups/mail.tpl:113 plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/mail.tpl:125 plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:442
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/class_servDNSeditZone.inc:587
@@ -5244,7 +5252,7 @@ msgstr "选择一个要删除或修改的变量"
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:334
+#: plugins/personal/samba/samba3.tpl:335
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/scalix/generic.tpl:88
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
@@ -6379,7 +6387,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "您无权删除这个用户！"
 
 #: plugins/admin/users/class_userManagement.inc:516
-#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/groups/class_groupMail.inc:304
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6388,13 +6396,13 @@ msgstr "无"
 
 #: plugins/admin/users/class_userManagement.inc:582
 #: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Name' is not set."
 msgstr "需要的“姓名”字段没有设置"
 
 #: plugins/admin/users/class_userManagement.inc:585
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1067
 msgid "The required field 'Given name' is not set."
 msgstr "需要的“教名”字段没有设置"
 
@@ -6972,89 +6980,89 @@ msgstr "'UID' 赋值太小。"
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "太多用户组，无法分配可用 ID！"
 
-#: plugins/admin/groups/class_groupMail.inc:81
+#: plugins/admin/groups/class_groupMail.inc:82
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "在您的 gosa.conf 中，没有邮件方法 '%s'。"
 
-#: plugins/admin/groups/class_groupMail.inc:297
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "read"
 msgstr "读"
 
-#: plugins/admin/groups/class_groupMail.inc:298
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "post"
 msgstr "è´´"
 
-#: plugins/admin/groups/class_groupMail.inc:299
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "external post"
 msgstr "外部粘贴"
 
-#: plugins/admin/groups/class_groupMail.inc:300
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "append"
 msgstr "附加"
 
-#: plugins/admin/groups/class_groupMail.inc:301
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "write"
 msgstr "写"
 
-#: plugins/admin/groups/class_groupMail.inc:302
+#: plugins/admin/groups/class_groupMail.inc:303
 msgid "admin"
 msgstr "管理员"
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid "This 'dn' has no valid mail extensions."
 msgstr "这个 'dn' 没有有效邮件扩展。"
 
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr "删除邮件账号"
 
-#: plugins/admin/groups/class_groupMail.inc:345
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户邮件功能已启用。您可以点击下面的按钮禁用。"
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr "创建邮件账号"
 
-#: plugins/admin/groups/class_groupMail.inc:348
+#: plugins/admin/groups/class_groupMail.inc:349
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr "这个账户邮件功能已禁用。您可以点击下面的按钮来启用。"
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "当条目从 LDAP 中删除后，从邮件服务器数据库中删除共享目录"
 
-#: plugins/admin/groups/class_groupMail.inc:361
+#: plugins/admin/groups/class_groupMail.inc:362
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr "在保存完毕该账号后，删除共享目录和其中所有内容"
 
-#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/groups/class_groupMail.inc:418
 #: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
 
-#: plugins/admin/groups/class_groupMail.inc:423
+#: plugins/admin/groups/class_groupMail.inc:424
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "添加您自己的一个邮件地址到转发地址没有任何意义。"
 
-#: plugins/admin/groups/class_groupMail.inc:451
+#: plugins/admin/groups/class_groupMail.inc:452
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:163
@@ -7064,109 +7072,109 @@ msgid ""
 "addresses."
 msgstr "您正在添加一个无效的邮件地址到替代地址列表。"
 
-#: plugins/admin/groups/class_groupMail.inc:456
+#: plugins/admin/groups/class_groupMail.inc:457
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:178
 msgid "The address you're trying to add is already used by user"
 msgstr "您正在添加的地址已经被用户使用"
 
-#: plugins/admin/groups/class_groupMail.inc:614
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Unspecified"
 msgstr "未定义"
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:616
 #, fuzzy
 msgid "Mails"
 msgstr "邮件"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Tasks"
 msgstr "任务"
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:617
 #, fuzzy
 msgid "Journals"
 msgstr "小时"
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:618
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr "联系"
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:619
 #, fuzzy
 msgid "Notes"
 msgstr "否"
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:622
 #, fuzzy
 msgid "Inbox"
 msgstr "索引"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 #, fuzzy
 msgid "Drafts"
 msgstr "日期"
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:623
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:624
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:676
+#: plugins/admin/groups/class_groupMail.inc:683
 msgid "Removing group mail settings failed"
 msgstr "删除组邮件设置失败"
 
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 msgid "Saving group mail settings failed"
 msgstr "保存组邮件设置失败"
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:946
 #: plugins/personal/mail/class_mailAccount.inc:978
 msgid "The required field 'Primary address' is not set."
 msgstr "要求的字段“主要地址”没有设置。"
 
-#: plugins/admin/groups/class_groupMail.inc:942
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "请在“主要地址”栏输入一个有效邮件地址。"
 
-#: plugins/admin/groups/class_groupMail.inc:948
+#: plugins/admin/groups/class_groupMail.inc:955
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:996
 msgid "The primary address you've entered is already in use."
 msgstr "您输入的主要地址已经在使用了。"
 
-#: plugins/admin/groups/class_groupMail.inc:954
+#: plugins/admin/groups/class_groupMail.inc:961
 #: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Value in 'Quota size' is not valid."
 msgstr "'Quota 大小' 的值无效。"
 
-#: plugins/admin/groups/class_groupMail.inc:963
+#: plugins/admin/groups/class_groupMail.inc:970
 #: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "请指定一个将要被退回的邮件大小。"
 
-#: plugins/admin/groups/class_groupMail.inc:971
+#: plugins/admin/groups/class_groupMail.inc:978
 #: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "为了退信，您需要设定最大的邮件大小。"
 
-#: plugins/admin/groups/class_groupMail.inc:975
+#: plugins/admin/groups/class_groupMail.inc:982
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr "请选择一个有效的权限设置。缺省权限不能为空。"
 
-#: plugins/admin/groups/class_groupMail.inc:979
+#: plugins/admin/groups/class_groupMail.inc:986
 msgid "Please select a valid mail server."
 msgstr "请选择一个有效的邮件服务器。"
 
@@ -7192,11 +7200,11 @@ msgstr "替代地址"
 msgid "List of alternative mail addresses"
 msgstr "替代邮件地址列表"
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:118
 msgid "Forward messages to non group members"
 msgstr "转发邮件到非组成员"
 
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:126
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:224
@@ -7249,6 +7257,18 @@ msgstr "缺省权限"
 msgid "Member permission"
 msgstr "成员权限"
 
+#: plugins/admin/groups/mail.tpl:105 plugins/personal/mail/generic.tpl:234
+msgid "Advanced mail options"
+msgstr "高级邮件选项"
+
+#: plugins/admin/groups/mail.tpl:110 plugins/personal/mail/generic.tpl:239
+msgid "Select if user can only send and receive inside his own domain"
+msgstr "选择如果用户只能发送和接收本域内邮件"
+
+#: plugins/admin/groups/mail.tpl:111 plugins/personal/mail/generic.tpl:240
+msgid "User is only allowed to send and receive local mails"
+msgstr "用户只能发送和接收本地邮件"
+
 #: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "组管理"
@@ -7618,68 +7638,68 @@ msgstr "显示用户地址"
 msgid "User name of which addresses are shown"
 msgstr "显示属于该地址的用户"
 
-#: plugins/admin/groups/acl_definition.inc:260
+#: plugins/admin/groups/acl_definition.inc:261
 #, fuzzy
 msgid "Enable vacation message"
 msgstr "启用假期信息"
 
-#: plugins/admin/groups/acl_definition.inc:262
+#: plugins/admin/groups/acl_definition.inc:263
 #, fuzzy
 msgid "Vacation start/stop"
 msgstr "假期模板"
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Scalix Mail node"
 msgstr "Scalix 邮件节点"
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Mailbox class"
 msgstr "邮箱类别"
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Server language"
 msgstr "服务器语言"
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:451
 #: plugins/personal/environment/class_environment.inc:1176
 msgid "Administrator"
 msgstr "管理员"
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Mailbox administrator"
 msgstr "邮箱管理员"
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Hide user entry in Scalix"
 msgstr "在 Scalix 中隐藏用户条目"
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Mailbox size limitations"
 msgstr "邮箱大小限制"
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Limit outbound"
 msgstr "限制出栈"
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:456
 msgid "Limit inbound"
 msgstr "限制入栈"
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:457
 msgid "Notify user"
 msgstr "通知用户"
 
-#: plugins/admin/groups/acl_definition.inc:457
+#: plugins/admin/groups/acl_definition.inc:458
 #: plugins/personal/scalix/generic.tpl:80
 msgid "Scalix email addresses"
 msgstr "Scalix 邮件地址"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Create/edit new task"
 msgstr "创建新用户"
 
-#: plugins/admin/groups/acl_definition.inc:458
+#: plugins/admin/groups/acl_definition.inc:459
 #, fuzzy
 msgid "Remove tasks"
 msgstr "删除选项"
@@ -9074,7 +9094,7 @@ msgid "Domain Name Service"
 msgstr "时间服务"
 
 #: plugins/admin/systems/dhcp_network.tpl:52
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:22
 msgid "Domain"
 msgstr "域"
 
@@ -9437,7 +9457,7 @@ msgstr "字段“IP 地址”格式错误"
 msgid "The required field 'MAC-address' is not set."
 msgstr "需要的字段“MAC 地址”没有设置。"
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:462
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -9572,6 +9592,8 @@ msgstr "选择发行名称"
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
 #: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#: plugins/personal/samba/class_sambaAccount.inc:1298
+#: plugins/personal/samba/class_sambaAccount.inc:1305
 #, fuzzy
 msgid "seconds"
 msgstr "(秒)"
@@ -11637,6 +11659,15 @@ msgid "Number of listed windows workstations"
 msgstr "显示 Windows 工作站"
 
 #: plugins/admin/systems/class_terminalService.inc:150
+#: plugins/personal/samba/class_sambaAccount.inc:1276
+#: plugins/personal/samba/class_sambaAccount.inc:1282
+#: plugins/personal/samba/class_sambaAccount.inc:1288
+#: plugins/personal/samba/class_sambaAccount.inc:1296
+#: plugins/personal/samba/class_sambaAccount.inc:1303
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1321
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
 msgid "default"
 msgstr "缺省"
 
@@ -12141,21 +12172,21 @@ msgstr "字段“名称”包含保留字 '%s'。请选择其他名字。"
 #: plugins/admin/departments/class_departmentGeneric.inc:245
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/addons/addressbook/class_addressbook.inc:604
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/personal/generic/class_user.inc:1111
+#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1113
 msgid "The field 'Name' contains invalid characters."
 msgstr "“姓名”字段包含无效字符。"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:248
 #: plugins/addons/addressbook/class_addressbook.inc:584
 #: plugins/addons/addressbook/class_addressbook.inc:587
-#: plugins/personal/generic/class_user.inc:1094
+#: plugins/personal/generic/class_user.inc:1096
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "“电话”字段包含无效电话号码。"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:251
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1097
+#: plugins/personal/generic/class_user.inc:1099
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "“传真”字段包含一个无效电话号码"
 
@@ -12393,7 +12424,7 @@ msgid ""
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话队列。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
 msgid "Please select a valid goFonHomeServer."
 msgstr "请选择一个有效的 goFonHomeServer。"
 
@@ -12420,7 +12451,7 @@ msgstr "必须至少定义一个队列数字"
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:925
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -12459,8 +12490,8 @@ msgstr "Mysql 查询失败。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1476
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1478
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1480
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
@@ -13573,82 +13604,72 @@ msgstr "查无结果..."
 msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr "从 '%s' 删除宏失败。通过 GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
-#, php-format
-msgid "More than one '(' is currently not supported. Line : '%s'."
-msgstr "当前不支持一个以上的 '('。行: '%s'。"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "More than one ')' is currently not supported. Line : '%s'."
-msgstr "当前不支持一个以上的 ')'。行: '%s'。"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:300
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "没有给出应用程序，在行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:302
+#: plugins/gofon/macro/class_gofonMacro.inc:304
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "没有给出扩展类型，在行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:333
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "为服务器 '%s' 插入新宏失败。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:368
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来保存电话宏。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:381
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "给出的 cn '%s' 已经存在。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "为保存这个宏，您必须提供“显示名称”"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:391
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr "提供的 cn 可能太长，为创建一个 Makro 条目，最多 20 个字符。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr "权限不足，无法在 goFonMacro 中修改属性 '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
 msgstr "该宏仍在使用。有必要将这个宏标记为用户可见。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:428
+#: plugins/gofon/macro/class_gofonMacro.inc:429
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr "该宏仍在使用。要删除这个宏先确认没有人使用它。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:441
+#: plugins/gofon/macro/class_gofonMacro.inc:442
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr "无法从 asterisk 数据库中删除该宏记录。请检查您的 asterisk 数据库配置。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:447
+#: plugins/gofon/macro/class_gofonMacro.inc:448
 msgid "Removing phone macro failed"
 msgstr "删除电话宏失败"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:457
 msgid "Removing phone macro reverences failed"
 msgstr "删除电话宏引用失败"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr "保存电话宏失败"
 
@@ -13711,7 +13732,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr "权限不足，不能在 goFonMacro 中修改属性 '%s'。"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
@@ -13856,90 +13877,91 @@ msgstr ""
 "老的 MySQL 主服务器 '%s' 无法被用户 '%s' 访问。取消保存将保持数据库的完整性，"
 "通过 GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:807
 msgid "Error while performing query:"
 msgstr "执行查询时错误:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1023
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:884
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "This account has no phone extensions."
 msgstr "这个账号没有电话扩展。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:912
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:910
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr "您选择的宏不能继续使用，请选择另外一个。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
 msgid "Remove phone account"
 msgstr "删除电话账号"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1032
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户电话功能已启用。您可以点击下面的按钮禁用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1037
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1040
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Create phone account"
 msgstr "创建电话账号"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr "这个账户电话功能已禁用。您可以点击下面的按钮来启用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1041
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1039
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr "这个账户的电话功能被禁用。您可以点击下面按钮来启用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1054
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1052
+#, php-format
 msgid ""
 "Please enter a valid phone number! Because of the realtime extension tables, "
-"the number must be less than 11 digits."
+"the number must be less than %s digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1093
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1091
 msgid "Choose your private phone"
 msgstr "选择您私人电话"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1211
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1209
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话账号。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1219
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1220
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr "输入的语音邮件 PIN 包含无效字符，只允许数字。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1225
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr "输入的电话 PIN 包含无效字符，只允许字母数字。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1238
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "您需要提供至少一个电话号码！"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Saving phone account failed"
 msgstr "保存电话账号失败"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1359
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13947,27 +13969,27 @@ msgid ""
 msgstr ""
 "MySQL 服务器'%s' 无法被用户 '%s' 访问，通过 GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1370
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "无法选择数据库 %s 在 %s 上。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1409
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr "无法删除电话账号，PHP 配置中没有 mysql 扩展。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1440
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1447
 msgid "Removing phone account failed"
 msgstr "删除电话账号失败"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1524
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -14652,18 +14674,18 @@ msgstr "移动电话"
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/addons/addressbook/class_addressbook.inc:601
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/personal/generic/class_user.inc:1108
+#: plugins/personal/generic/class_user.inc:1091
+#: plugins/personal/generic/class_user.inc:1110
 msgid "The field 'Given name' contains invalid characters."
 msgstr "“教名”字段包含无效字符。"
 
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/personal/generic/class_user.inc:1100
+#: plugins/personal/generic/class_user.inc:1102
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "“手机”字段包含无效手机号码。"
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1105
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "“传呼”字段包含无效电话号码。"
 
@@ -15012,6 +15034,7 @@ msgid "hour"
 msgstr "小时"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/personal/samba/class_sambaAccount.inc:1411
 msgid "hours"
 msgstr "小时"
 
@@ -15194,120 +15217,120 @@ msgstr "这个账号不能被删除因为还有代理人配置。先删除这些
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "January"
 msgstr "一月"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "February"
 msgstr "二月"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "March"
 msgstr "三月"
 
 #: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
-#: plugins/personal/samba/class_sambaAccount.inc:397
-#: plugins/personal/samba/class_sambaAccount.inc:415
-#: plugins/personal/samba/class_sambaAccount.inc:433
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/personal/generic/class_user.inc:265
 msgid "April"
 msgstr "四月"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "May"
 msgstr "五月"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "June"
 msgstr "六月"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "July"
 msgstr "七月"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "August"
 msgstr "八月"
 
 #: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/samba/class_sambaAccount.inc:416
-#: plugins/personal/samba/class_sambaAccount.inc:434
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
 #: plugins/personal/generic/class_user.inc:266
 msgid "September"
 msgstr "九月"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "October"
 msgstr "十月"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "November"
 msgstr "十一月"
 
 #: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/samba/class_sambaAccount.inc:417
-#: plugins/personal/samba/class_sambaAccount.inc:435
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:437
+#: plugins/personal/samba/class_sambaAccount.inc:455
 #: plugins/personal/generic/class_user.inc:267
 msgid "December"
 msgstr "十二月"
@@ -15417,18 +15440,6 @@ msgstr "到目录"
 msgid "Reject mails bigger than"
 msgstr "拒绝邮件大小超过"
 
-#: plugins/personal/mail/generic.tpl:234
-msgid "Advanced mail options"
-msgstr "高级邮件选项"
-
-#: plugins/personal/mail/generic.tpl:239
-msgid "Select if user can only send and receive inside his own domain"
-msgstr "选择如果用户只能发送和接收本域内邮件"
-
-#: plugins/personal/mail/generic.tpl:240
-msgid "User is only allowed to send and receive local mails"
-msgstr "用户只能发送和接收本地邮件"
-
 #: plugins/personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "选择类别"
@@ -15624,7 +15635,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:269
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:290
 msgid "Password expires on"
 msgstr "口令过期截止日"
 
@@ -15634,8 +15645,8 @@ msgstr "Posix 设置"
 
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:702
+#: plugins/personal/samba/samba3.tpl:115
+#: plugins/personal/samba/class_sambaAccount.inc:750
 msgid "Home directory"
 msgstr "用户主目录"
 
@@ -15720,20 +15731,20 @@ 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:703
+#: plugins/personal/samba/samba3.tpl:124
+#: plugins/personal/samba/class_sambaAccount.inc:751
 msgid "Profile path"
 msgstr "Profile path"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:274
 msgid "Access options"
 msgstr "访问选项"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:280
 msgid "Allow user to change password from client"
 msgstr "允许用户从客户端修改口令"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:283
 msgid "Login from windows client requires no password"
 msgstr "从 Windows 客户端登录不需要口令"
 
@@ -15741,206 +15752,374 @@ msgstr "从 Windows 客户端登录不需要口令"
 msgid "Temporary disable samba account"
 msgstr "临时禁用 samba 账号"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:59
+#, fuzzy
+msgid "Show information"
+msgstr "显示信息"
+
+#: plugins/personal/samba/samba3.tpl:61
+#, fuzzy
+msgid "Hide"
+msgstr "头"
+
+#: plugins/personal/samba/samba3.tpl:63
+#, fuzzy
+msgid "Show"
+msgstr "Shadowing"
+
+#: plugins/personal/samba/samba3.tpl:77
 msgid "Terminal Server"
 msgstr "终端服务器"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:112
 msgid "Allow login on terminal server"
 msgstr "允许登录到终端服务器"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:138
 msgid "Inherit client config"
 msgstr "继承客户配置"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:141
 msgid "Initial program"
 msgstr "初始程序"
 
-#: plugins/personal/samba/samba3.tpl:132
+#: plugins/personal/samba/samba3.tpl:152
 msgid "Working directory"
 msgstr "工作目录"
 
-#: plugins/personal/samba/samba3.tpl:155
+#: plugins/personal/samba/samba3.tpl:175
 msgid "Timeout settings (in minutes)"
 msgstr "超时设置（分钟）"
 
-#: plugins/personal/samba/samba3.tpl:160
-#: plugins/personal/samba/class_sambaAccount.inc:710
+#: plugins/personal/samba/samba3.tpl:180
+#: plugins/personal/samba/class_sambaAccount.inc:758
 msgid "Connection"
 msgstr "连接"
 
-#: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:711
+#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/class_sambaAccount.inc:759
 msgid "Disconnection"
 msgstr "断开"
 
-#: plugins/personal/samba/samba3.tpl:178
-#: plugins/personal/samba/class_sambaAccount.inc:712
+#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/class_sambaAccount.inc:760
 msgid "IDLE"
 msgstr "闲"
 
-#: plugins/personal/samba/samba3.tpl:191
+#: plugins/personal/samba/samba3.tpl:211
 msgid "Client devices"
 msgstr "客户设备"
 
-#: plugins/personal/samba/samba3.tpl:196
+#: plugins/personal/samba/samba3.tpl:216
 msgid "Connect client drives at logon"
 msgstr "登录时连接客户驱动器"
 
-#: plugins/personal/samba/samba3.tpl:202
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Connect client printers at logon"
 msgstr "登录时连接客户打印机"
 
-#: plugins/personal/samba/samba3.tpl:208
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Default to main client printer"
 msgstr "缺省用主要客户打印机"
 
-#: plugins/personal/samba/samba3.tpl:218
+#: plugins/personal/samba/samba3.tpl:238
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: plugins/personal/samba/samba3.tpl:222
+#: plugins/personal/samba/samba3.tpl:242
 msgid "Shadowing"
 msgstr "Shadowing"
 
-#: plugins/personal/samba/samba3.tpl:231
+#: plugins/personal/samba/samba3.tpl:251
 msgid "On broken or timed out"
 msgstr "断开或超时"
 
-#: plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba3.tpl:259
 msgid "Reconnect if disconnected"
 msgstr "断线重连"
 
-#: plugins/personal/samba/samba3.tpl:266
+#: plugins/personal/samba/samba3.tpl:286
 msgid "Lock samba account"
 msgstr "锁定 samba 账号"
 
-#: plugins/personal/samba/samba3.tpl:281
-msgid "Limit Logon Time"
-msgstr "限制登录时间"
-
-#: plugins/personal/samba/samba3.tpl:293
-msgid "Limit Logoff Time"
-msgstr "限制退出时间"
-
-#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/samba3.tpl:307
 msgid "Account expires after"
 msgstr "账号过期于"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Samba logon times"
 msgstr "Samba 登录次数"
 
-#: plugins/personal/samba/samba3.tpl:322
+#: plugins/personal/samba/samba3.tpl:323
 msgid "Edit settings..."
 msgstr "编辑设置..."
 
-#: plugins/personal/samba/samba3.tpl:328
+#: plugins/personal/samba/samba3.tpl:329
 msgid "Allow connection from these workstations only"
 msgstr "只允许从这些工作站建立连接"
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "This account has no samba extensions."
 msgstr "这个账号没有 samba 扩展。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid "Remove samba account"
 msgstr "删除 samba 账号"
 
-#: plugins/personal/samba/class_sambaAccount.inc:223
+#: plugins/personal/samba/class_sambaAccount.inc:225
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户 samba 功能已启用。您可以点击下面的按钮禁用。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:233
-#: plugins/personal/samba/class_sambaAccount.inc:236
+#: plugins/personal/samba/class_sambaAccount.inc:235
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid "Create samba account"
 msgstr "创建 samba 账号"
 
-#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:236
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr "这个账户 samba 功能已禁用。您可以点击下面的按钮来启用。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:237
+#: plugins/personal/samba/class_sambaAccount.inc:239
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr "这个账户 samba 功能已禁用。该 samba 账户需要 Posix 功能，请先启用。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify on"
 msgstr "输入打开，通知打开"
 
-#: plugins/personal/samba/class_sambaAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input on, notify off"
 msgstr "输入打开，通知关闭"
 
-#: plugins/personal/samba/class_sambaAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, notify on"
 msgstr "输入关闭，通知打开"
 
-#: plugins/personal/samba/class_sambaAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "input off, nofify off"
 msgstr "输入关闭，通知关闭"
 
-#: plugins/personal/samba/class_sambaAccount.inc:501
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "disconnect"
 msgstr "断开"
 
-#: plugins/personal/samba/class_sambaAccount.inc:502
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "reset"
 msgstr "重置"
 
-#: plugins/personal/samba/class_sambaAccount.inc:504
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from any client"
 msgstr "从任意客户"
 
-#: plugins/personal/samba/class_sambaAccount.inc:505
+#: plugins/personal/samba/class_sambaAccount.inc:507
 msgid "from previous client only"
 msgstr "只从上一个客户"
 
-#: plugins/personal/samba/class_sambaAccount.inc:686
+#: plugins/personal/samba/class_sambaAccount.inc:664
+#, fuzzy, php-format
+msgid "The password is outdated since %s, by domain policy."
+msgstr "输入的新口令太短了。"
+
+#: plugins/personal/samba/class_sambaAccount.inc:668
+#, fuzzy, php-format
+msgid "The password is valid till %s, by user policy."
+msgstr "给出的口令差异值不是数字。"
+
+#: plugins/personal/samba/class_sambaAccount.inc:671
+#, php-format
+msgid "The password is valid till %s, by domain policy."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:726
 msgid "Removing Samba account failed"
 msgstr "删除 Samba 账号失败"
 
-#: plugins/personal/samba/class_sambaAccount.inc:705
+#: plugins/personal/samba/class_sambaAccount.inc:743
+#, fuzzy, php-format
+msgid "Please select a value for 'Home drive'."
+msgstr "请选择一个有效的 goFonHomeServer。"
+
+#: plugins/personal/samba/class_sambaAccount.inc:746
+#, fuzzy, php-format
+msgid "Please specify a value for 'Home path'."
+msgstr "请为属性“路径”给定一个值"
+
+#: plugins/personal/samba/class_sambaAccount.inc:753
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "给出的数据 '%s' 包含无效字符！"
 
-#: plugins/personal/samba/class_sambaAccount.inc:715
+#: plugins/personal/samba/class_sambaAccount.inc:763
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr "超时属性 '%s' 检查发现包含无效字符或者为空！"
 
-#: plugins/personal/samba/class_sambaAccount.inc:721
+#: plugins/personal/samba/class_sambaAccount.inc:769
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr "Windows 用户管理员只允许八个客户。您指定的超过八个。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:943
+#: plugins/personal/samba/class_sambaAccount.inc:995
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr "警告：这个账号分配了一个未定义的 samba SID。这个问题不能被 GOsa 解决。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:967
+#: plugins/personal/samba/class_sambaAccount.inc:1019
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr "警告: 无法识别用户主要组──无法转换到一个 samba 组。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: plugins/personal/samba/class_sambaAccount.inc:1123
 msgid "Saving Samba account failed"
 msgstr "保存 Samba 账号失败"
 
+#: plugins/personal/samba/class_sambaAccount.inc:1311
+#: plugins/personal/samba/class_sambaAccount.inc:1315
+#: plugins/personal/samba/class_sambaAccount.inc:1412
+#, fuzzy
+msgid "minutes"
+msgstr "打印机"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1313
+#, fuzzy
+msgid "forever"
+msgstr "之前"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1327
+#: plugins/personal/samba/class_sambaAccount.inc:1335
+#, fuzzy
+msgid "off"
+msgstr "关"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1329
+#: plugins/personal/samba/class_sambaAccount.inc:1337
+#, fuzzy
+msgid "on"
+msgstr "关闭"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1345
+#: plugins/personal/samba/class_sambaAccount.inc:1353
+#: plugins/personal/samba/class_sambaAccount.inc:1361
+#: plugins/personal/samba/class_sambaAccount.inc:1369
+#: plugins/personal/samba/class_sambaAccount.inc:1377
+#: plugins/personal/samba/class_sambaAccount.inc:1385
+#: plugins/personal/samba/class_sambaAccount.inc:1393
+#: plugins/personal/samba/class_sambaAccount.inc:1402
+#, fuzzy
+msgid "unset"
+msgstr "设置"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1404
+msgid "immediately"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1418
+#, fuzzy
+msgid "Domain attributes"
+msgstr "电话属性"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1419
+#: plugins/personal/samba/class_sambaAccount.inc:1420
+#, fuzzy
+msgid "Min password length"
+msgstr "口令最小长度"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1421
+#, fuzzy
+msgid "Password history"
+msgstr "口令存储"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1422
+#, fuzzy
+msgid "Force password change"
+msgstr "修改口令"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1423
+#, fuzzy
+msgid "Maximum password age"
+msgstr "最大文件大小"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1424
+#, fuzzy
+msgid "Minimum password age"
+msgstr "管理员口令"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1425
+#, fuzzy
+msgid "Lockout duration"
+msgstr "位置"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1426
+msgid "Bad lockout attempt"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1427
+#, fuzzy
+msgid "Disconnect time"
+msgstr "断开"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1428
+#, fuzzy
+msgid "Refuse machine password change"
+msgstr "活动，口令不可更改"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1430
+#, fuzzy
+msgid "User attributes"
+msgstr "脚本属性"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1431
+#, fuzzy
+msgid "Last failed login"
+msgstr "最后登录"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1432
+#, fuzzy
+msgid "Logon attempts"
+msgstr "登录脚本"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1433
+#, fuzzy
+msgid "Last password update"
+msgstr "重复新口令"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1434
+#: plugins/personal/generic/generic.tpl:191
+#, fuzzy
+msgid "Last logon"
+msgstr "最后登录"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1435
+#, fuzzy
+msgid "Last logoff"
+msgstr "最后登录"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1436
+#, fuzzy
+msgid "Automatic logoff"
+msgstr "自动"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1437
+#, fuzzy
+msgid "Password expires"
+msgstr "口令过期截止日"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1438
+#, fuzzy
+msgid "Password change available"
+msgstr "不允许修改口令"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "选择要添加的工作站"
@@ -16080,61 +16259,61 @@ msgstr "无效"
 msgid "No certificate installed"
 msgstr "未安装证书"
 
-#: plugins/personal/generic/class_user.inc:583
+#: plugins/personal/generic/class_user.inc:585
 msgid "Removing generic user account failed"
 msgstr "删除一般用户账号失败"
 
-#: plugins/personal/generic/class_user.inc:615
-#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:959
 msgid "Kerberos database communication failed"
 msgstr "Kerberos 数据库通讯失败"
 
-#: plugins/personal/generic/class_user.inc:629
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:631
+#: plugins/personal/generic/class_user.inc:976
 msgid "Can't remove user from kerberos database."
 msgstr "无法从 kerberos 数据库删除用户"
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Saving generic user account failed"
 msgstr "保存一般用户账号失败"
 
-#: plugins/personal/generic/class_user.inc:985
+#: plugins/personal/generic/class_user.inc:987
 msgid "Can't add user to kerberos database."
 msgstr "无法添加用户到 kerberos 数据库"
 
-#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1041
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "您无权在 'Base' 下创建一个用户。"
 
-#: plugins/personal/generic/class_user.inc:1044
+#: plugins/personal/generic/class_user.inc:1046
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "您无权从原 'Base' 移动一个用户。"
 
-#: plugins/personal/generic/class_user.inc:1059
+#: plugins/personal/generic/class_user.inc:1061
 msgid "There's already a person with this 'Login' in the database."
 msgstr "数据库中已经有同样登录名的用户。"
 
-#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The required field 'Login' is not set."
 msgstr "需要的“登录名”字段没有设置"
 
-#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1075
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr "数据库中已经有同样“姓名/教名”组合的用户。"
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr "登录名包含无效字符。只允许小写字母，数字和短线。"
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "“主页”字段包含无效 URL 定义"
 
-#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1232
 msgid "Could not open specified certificate!"
 msgstr "无法打开指定证书！"
 
@@ -16207,11 +16386,6 @@ msgstr "Kerberos"
 msgid "Edit properties"
 msgstr "编辑属性"
 
-#: plugins/personal/generic/generic.tpl:191
-#, fuzzy
-msgid "Last logon"
-msgstr "最后登录"
-
 #: plugins/personal/generic/generic.tpl:207
 msgid "Organizational information"
 msgstr "组织信息"
@@ -17330,6 +17504,18 @@ msgstr "通过 quota 限制代理使用"
 msgid "per"
 msgstr "每"
 
+#~ msgid "More than one '(' is currently not supported. Line : '%s'."
+#~ msgstr "当前不支持一个以上的 '('。行: '%s'。"
+
+#~ msgid "More than one ')' is currently not supported. Line : '%s'."
+#~ msgstr "当前不支持一个以上的 ')'。行: '%s'。"
+
+#~ msgid "Limit Logon Time"
+#~ msgstr "限制登录时间"
+
+#~ msgid "Limit Logoff Time"
+#~ msgstr "限制退出时间"
+
 #~ msgid "You're trying to add an invalid email address "
 #~ msgstr "您正在添加一个无效邮件地址"