updating french locale for 2.5.3

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

diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index e0f6903883eb2dc5c0fba7a4dc976d5c790ed2dc..687d3d9a0e2cbd8dea49bce68cbec35fc80f79c7 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index df90ee8045fc47c5a1ab61037687b9022151a944..862840bf4fe4efa1aa6900627fa82a315a755e0f 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
-"POT-Creation-Date: 2003-09-19 13:41+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2006-06-26 15:16+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -121,7 +121,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -174,7 +174,7 @@ msgstr "Geräte"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -284,39 +284,39 @@ msgstr "Übersicht"
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italienisch"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Polnisch"
 
@@ -499,6 +499,7 @@ msgstr "Angezeigter Name"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Name"
@@ -1026,7 +1027,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1122,6 +1123,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1138,7 +1140,7 @@ msgstr "Entfernen"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1174,9 +1176,9 @@ msgstr "Entfernen"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1192,13 +1194,16 @@ msgstr "Entfernen"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1491,7 +1496,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1503,16 +1508,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1885,7 +1893,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Unterstützung für Kolab aktiviert"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2568,11 +2576,11 @@ msgstr "Konfigurieren"
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -2581,7 +2589,7 @@ msgstr ""
 "verloren gegangen sind. Bitte prüfen Sie die LDAP-Konfiguration um "
 "eventuelle Fehler aufzudecken und wiederholen Sie die Aktion."
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -2589,19 +2597,19 @@ msgstr ""
 "Bitte prüfen Sie ihre Eingaben und beheben Sie den Fehler. Drücken Sie den "
 "'OK'-Knopf um dieses Meldungsfenster zu schließen."
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr "Es ist ein Fehler bei der Bearbeitung ihrer Anfrage aufgetreten"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2611,19 +2619,19 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -2734,12 +2742,12 @@ msgstr "Objekt"
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "unbekannter FAI-Status %s"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2748,17 +2756,17 @@ msgstr ""
 "Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
 "unterstützt. Bitte melden Sie dies an das Entwicklerteam."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2767,12 +2775,12 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3173,8 +3181,8 @@ msgstr "Alternative Adressen"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3207,6 +3215,8 @@ msgstr "Alternative Adressen"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3229,7 +3239,7 @@ msgstr "Lokale hinzufügen"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3285,7 +3295,7 @@ msgstr "Liste alternativer Mail-Adressen"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3302,7 +3312,7 @@ msgstr "Kontingent-Nutzung"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "nicht definiert"
 
@@ -3658,7 +3668,7 @@ msgstr "unkonfiguriert"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4283,25 +4293,27 @@ msgstr "Speichern des Samba-Kontos fehlgeschlagen"
 msgid "User environment settings"
 msgstr "Einstellungen der Benutzer-Umgebung"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Bitte geben Sie einen gültigen Namen ein (0-9 und a-z sind erlaubt)."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Ungültiges Zeichen im Feld 'Beschreibung'. Bitte geben Sie eine gültige "
 "Beschreibung ein."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr "Bitte geben Sie eine gültige ID ein!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr "Ein Eintrag mit diesem Namen existiert bereits."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
@@ -4340,11 +4352,11 @@ msgstr "Regulärer Ausdruck zum Erkennen von Hotplug-Geräten"
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr "auto"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4355,34 +4367,34 @@ msgstr ""
 "Sie haben einen Hook für das externe Beziehen von Auflösungen angegeben. "
 "Dieser kann nicht ausgeführt werden. Prüfsen Sie die Berechtigungen von '%s'."
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr "Umgebungs-Erweiterung entfernen"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Dieses Konto besitzt aktivierte Umgebungs-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr "Umgebungs-Erweiterung hinzufügen"
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Aktuell besitzt dieses Konto keine aktivierten Umgebungs-Erweiterungen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -4391,31 +4403,31 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "keine"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr "Passwort zurücksetzen"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr "Diesen Freigabe-Eintrag entfernen"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -4424,15 +4436,15 @@ msgstr ""
 "Das ausgewählte Kiosk-Profil '%s' ist nicht mehr verfügbar, die Einstellung "
 "wurde auf 'keins' zurückgesetzt."
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr "Entfernen der Umgebungs-Informationen ist fehlgeschlagen"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr "Bitte wählen Sie eine gültige Kontingent-Grösse."
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -4440,33 +4452,25 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Das neue Kiosk-Profil kann nicht gespeichert werden. Wahrscheinlich besitzen "
 "Sie nicht die nötigen Rechte."
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr "Fehler beim Speichern des Druckers"
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr "Fehler beim Speichern der Drucker-Einstellungen"
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr "Hinzufügen der Umgebungs-Erweiterung ist fehlgeschlagen"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr "Gruppen-Freigabe"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr "Administrator"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Standard Drucker"
 
@@ -4676,9 +4680,18 @@ msgid "Device name"
 msgstr "Gerätename"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Vendor ID"
+msgstr "Absender-ID"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "Geräte ID"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5710,31 +5723,31 @@ msgstr "empfangen"
 msgid "Removing blocklist object failed"
 msgstr "Entfernen des Blocklisten-Objekts fehlgeschlagen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
 "anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr "Speichern des Blocklisten-Objekts fehlgeschlagen"
 
@@ -5974,7 +5987,7 @@ msgstr "Aktualisieren"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -6001,7 +6014,7 @@ msgstr "Benutzer bearbeiten"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6226,7 +6239,7 @@ msgstr "Fax-ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Benutzer"
@@ -7169,6 +7182,7 @@ msgstr "Systemprotokolle"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Herunterladen"
 
@@ -7190,9 +7204,9 @@ msgstr "Speichern des FAI-Skripts fehlgeschlagen"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr "Objekte"
 
@@ -7711,7 +7725,7 @@ msgstr ""
 "Sie haben mehr als 3 primäre Partitionen in ihrer Konfiguration. Bitte "
 "prüfen Sie die Konfiguration."
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Liste der Skripte"
 
@@ -7853,7 +7867,8 @@ msgid "List of FAI classes"
 msgstr "Liste benutzter Klassen"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
+#, fuzzy
+msgid "This table displays all FAL classes, in the selected tree."
 msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
 
 #: plugins/admin/fai/class_divListFai.inc:48
@@ -8244,8 +8259,8 @@ msgstr "Besitzer"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8296,7 +8311,7 @@ msgstr "Andere"
 msgid "sticky"
 msgstr "sticky"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Liste der Hook-Skripte"
 
@@ -8555,34 +8570,34 @@ msgstr "Anwendung"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr "Ausschneiden"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr "Kopieren"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8590,7 +8605,7 @@ msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8888,7 +8903,7 @@ msgstr ""
 "ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Vorlage"
 
@@ -9134,7 +9149,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -9148,7 +9163,7 @@ msgid "Create new application"
 msgstr "Neue Anwendungen erstellen"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
@@ -9206,13 +9221,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
@@ -9220,61 +9235,61 @@ msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Dieser 'DN' ist keine Anwendung."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "Entfernen der Anwendung ist fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr "Entfernen der Anwendung von Objektgruppe '%s' fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Entfernen der Anwendung von der Gruppe '%s' ist fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr "Der angegebene Ausführungspfad muss zwingend mit '/' beginnen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Anwendung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr "Speichern der Anwendung ist fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
@@ -9398,7 +9413,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ".."
 
@@ -9460,8 +9475,8 @@ msgid "present"
 msgstr "vorhanden"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9956,10 +9971,17 @@ msgstr "Citrix Metaframe"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9988,30 +10010,30 @@ msgstr "geerbt"
 msgid "Bit"
 msgstr "Bit"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr "Speichern der Arbeitsstations-Dienste ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -10021,7 +10043,7 @@ msgstr ""
 "Das in KERNELS angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -10030,12 +10052,12 @@ msgstr ""
 "momentanen Einstellungen für Server und Release nicht aufgelöst werden "
 "können."
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 "Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -10043,7 +10065,7 @@ msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -10052,7 +10074,7 @@ msgstr ""
 "Kann eine oder mehrere der angegebenen FAI-Klasse(n) [%s] für FAI-Server '%"
 "s' nicht auflösen. Der Server wurde auf 'auto' zurückgesetzt."
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -10065,17 +10087,17 @@ msgstr ""
 "umbenannt). Alle (!) Klassen wurden von diesem Konto entfernt. Drücken Sie "
 "'Abbrechen', wenn Sie die diese Änderung nicht speichern möchten."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr "Speichern der Arbeitsstations-Einstellungen ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "Kann das als REPOSITORY_HOOK angegebene Kommando '%s' nicht ausführen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10597,7 +10619,7 @@ msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10702,7 +10724,7 @@ msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
@@ -10711,7 +10733,7 @@ msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
@@ -10810,31 +10832,31 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Kann '/etc/gosa/encodings' nicht lesen, bitte prüfen Sie die Rechte."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Bitte geben Sie einen gültigen Pfad an."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Bitte geben Sie einen gültigen Freigabe-Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Bitte geben Sie einen Freigabe-Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "Das Feld 'Volume' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
@@ -12072,72 +12094,72 @@ msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr "Arbeitsstation installiert gerade"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr "Arbeitsstation wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr "Installation der Arbeitsstation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr "Server wird installiert"
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr "Server wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr "Server-Installation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
@@ -12378,42 +12400,42 @@ msgstr "Bitte geben Sie im Feld 'Ablauf' einen numerischen Wert ein."
 msgid "Please specify a numeric value for retry."
 msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 "Kann keine gültige Basis aus der Objekt-DN auslesen, setze Basis auf '%s'."
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 "Konnte den 'Druck'-Reiter nicht erstellen, der Parameter 'parent' fehlt"
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 "Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -12424,12 +12446,12 @@ msgstr ""
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -12437,7 +12459,7 @@ msgstr ""
 "Diese Workstation besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -12445,7 +12467,7 @@ msgstr ""
 "Dieses Terminal besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -12453,7 +12475,7 @@ msgstr ""
 "Aktuell besitzt diese Workstation keine aktivierte Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -12461,35 +12483,50 @@ msgstr ""
 "Aktuell besitzt dieses Terminal keine aktivierten Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr "keine PPD-Informationen verfügbar"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
 "möglich."
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr "Entfernen des Druckers ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr "Speichern des Druckers ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Wählen Sie eine Basis"
@@ -12860,6 +12897,245 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Auswahl der Drucker-PPD"
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "Kopfzeilen"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Funktion"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Drucker-Erweiterung entfernen"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Dieser Server besitzt aktivierte Kolab-Funtionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Kolab-Dienst hinzufügen"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten Kolab-Funktionen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten aktivieren."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Speichern des Kolab-Kontos ist fehlgeschlagen"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+#, fuzzy
+msgid "Required score must be a numeric value."
+msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Drucker-Erweiterung entfernen"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Dieser Server besitzt aktivierte Inventar-Funtionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Kolab-Dienst hinzufügen"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Speichern des Kolab-Kontos ist fehlgeschlagen"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "Mailgröße"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Überprüfe Parameter"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, fuzzy, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "Der Sieve-Port muss numerisch sein."
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Generische Benutzer-Information"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Datenbanken"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Datenbank"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Wählen Sie die hinzuzufügenden Nummern"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr "Es muss mindestens ein NTP-Server ausgewählt sein."
@@ -14056,6 +14332,12 @@ msgstr "Das GOsa Team"
 msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
+#~ msgid "Error while writing printer"
+#~ msgstr "Fehler beim Speichern des Druckers"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "Fehler beim Speichern der Drucker-Einstellungen"
+
 #~ msgid ""
 #~ "This menu allows you to create, delete and edit selected departments. "
 #~ "Having a large size of departments, you might prefer the range selectors "

diff --git a/locale/es/LC_MESSAGES/messages.mo b/locale/es/LC_MESSAGES/messages.mo
index 343eb36cf262d3d5b80396d27b57f462ed2b198b..99725a998c3f9611df95e2d2894d65af0e8376e1 100644 (file)
Binary files a/locale/es/LC_MESSAGES/messages.mo and b/locale/es/LC_MESSAGES/messages.mo differ

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index eee048d462c7d768c9d809359325baf7ccfac2cb..daf6497f18dce703da64cf33fc861ccc979fdb8a 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -4,6 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2006-06-12 19:27GMT\n"
 "Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
 "Language-Team: Español\n"
@@ -115,7 +117,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -168,7 +170,7 @@ msgstr "Servicios"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -278,39 +280,39 @@ msgstr ""
 msgid "Packages"
 msgstr "Paquetes"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italiano"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Polaco"
 
@@ -490,6 +492,7 @@ msgstr "Nombre mostrado"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nombre"
@@ -1009,7 +1012,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1105,6 +1108,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1121,7 +1125,7 @@ msgstr "Eliminar"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1157,9 +1161,9 @@ msgstr "Eliminar"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1175,13 +1179,16 @@ msgstr "Eliminar"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1467,7 +1474,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1479,16 +1486,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1856,7 +1866,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "Perfecto"
 
@@ -2515,35 +2525,35 @@ msgstr "Configurar"
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr "Un error ha ocurrido mientras se procesaba su petición"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr "Continuar de cualquier modo"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr "Editar de cualquier modo"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2552,19 +2562,19 @@ msgstr ""
 "Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
 "Por favor, contacte con esta persona para clarificar los procedimientos."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
@@ -2665,12 +2675,12 @@ msgstr "Objeto"
 msgid "Error while fetching source dn - aborted!"
 msgstr "Ha habido un error mientras se accedía al dn origen - ¡Abortado!"
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Estado FAI desconocido %s"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2679,17 +2689,17 @@ msgstr ""
 "Actualmente no esta soportada la creación automática del tipo '%s'. Por "
 "favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Mientras se conectaba al servidor LDAP '%s'"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2698,12 +2708,12 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3099,8 +3109,8 @@ msgstr "Direcciones alternativas"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3133,6 +3143,8 @@ msgstr "Direcciones alternativas"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3155,7 +3167,7 @@ msgstr "Añadir Cuenta Local"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3211,7 +3223,7 @@ msgstr "Lista de direcciones de correo alternativas."
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3228,7 +3240,7 @@ msgstr "Uso de la Cola de Correo"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "sin definirse"
 
@@ -3580,7 +3592,7 @@ msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4205,25 +4217,27 @@ msgstr ""
 msgid "User environment settings"
 msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Por favor especifique un nombre  valido: Solo se permiten 0-9 a-Z."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Caracteres no validos en la descripción, por favor especifique una "
 "descripción valida."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr "Por favor especifique un id valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr "Ya existe una entrada con este 'Nombre'."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor seleccione una entrada o presione cancelar."
 
@@ -4264,11 +4278,11 @@ msgstr ""
 msgid "Please select a printer or press cancel."
 msgstr "¡Por favor seleccione una impresora o presione cancelar."
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr "automático"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4277,32 +4291,32 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr "Eliminar extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "La extensión de estado está activada. Puede desactivarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "La extensión de estado está desactivada. Puede activarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -4310,76 +4324,68 @@ msgstr ""
 "La extensión de estado está desactivada. Debe crear una cuenta Posix antes "
 "de poder activarla."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Ninguno"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un punto de montaje válido."
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr "Reiniciar hash de la contraseña"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr "Eliminar entrada compartida"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr "Ha fallado al eliminar la extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr "Por favor especifique un tamaño de cuota del perfil valido"
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr "¡Error mientras se guardaba la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr "¡Error mientras se guardaban los parámetros de la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr "Ha fallado al añadir la información de estado"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr "grupos compartidos"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr "Administrador"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
@@ -4590,9 +4596,18 @@ msgid "Device name"
 msgstr "Nombre del dispositivo"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Vendor ID"
+msgstr "ID del Remitente"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "Identificador de dispositivo"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5606,28 +5621,28 @@ msgstr "recibir"
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -5867,7 +5882,7 @@ msgstr "Enviar departamentos"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5894,7 +5909,7 @@ msgstr "Editar usuario"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6120,7 +6135,7 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Usuario"
@@ -7057,6 +7072,7 @@ msgstr "Ver registro del sistema"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Descargar"
 
@@ -7078,9 +7094,9 @@ msgstr "Ha fallado la grabación del script FAI"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr "Objetos"
 
@@ -7588,7 +7604,7 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Lista de scripts"
 
@@ -7706,8 +7722,9 @@ msgid "List of FAI classes"
 msgstr "Lista de clases FAI"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
+#, fuzzy
+msgid "This table displays all FAL classes, in the selected tree."
+msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
 
 #: plugins/admin/fai/class_divListFai.inc:48
 msgid "This menu allows you to create, delete and edit FAI classes."
@@ -8085,8 +8102,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8137,7 +8154,7 @@ msgstr "Otros"
 msgid "sticky"
 msgstr "estatico"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Lista de scripts de acciones"
 
@@ -8391,34 +8408,34 @@ msgstr "Aplicación"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr "Cortar"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr "Cortar por esta entrada"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8426,7 +8443,7 @@ msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8720,7 +8737,7 @@ msgstr ""
 "Elegir 'ninguno' para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Plantilla"
 
@@ -8962,7 +8979,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -8976,7 +8993,7 @@ msgid "Create new application"
 msgstr "Crear nueva aplicación"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
@@ -9035,13 +9052,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
@@ -9049,58 +9066,58 @@ msgstr "¡No tiene permisos para eliminar esta aplicación!"
 msgid "no example"
 msgstr "sin ejemplo"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "Ha fallado la eliminación de la aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr "Ha fallado la grabación de la aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr "Parámetros de aplicaciones"
 
@@ -9220,7 +9237,7 @@ msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ""
 
@@ -9278,8 +9295,8 @@ msgid "present"
 msgstr "presente"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9773,10 +9790,17 @@ msgstr "Cliente ICA"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9805,30 +9829,30 @@ msgstr ""
 msgid "Bit"
 msgstr "Bit"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -9838,17 +9862,17 @@ msgstr ""
 "El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' "
 "no parece existir."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9856,14 +9880,14 @@ msgstr ""
 "Ya existe un usuario con este perfil en su selección que tiene "
 "configuraciones de tabla de particiones."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9872,18 +9896,18 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr ""
 "Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10385,7 +10409,7 @@ msgstr ""
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10486,7 +10510,7 @@ msgid "New Terminal template"
 msgstr "Nueva plantilla de terminal"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
@@ -10495,7 +10519,7 @@ msgid "New Workstation template"
 msgstr "Nueva plantilla de estación de trabajo"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
@@ -10593,31 +10617,31 @@ msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 "No se puede leer '/etc/gosa/encodings', por favor compruebe los permisos."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Por favor especifique una ruta valida para su configuración."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Por favor especifique un nombre valido para su recurso compartido."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Por favor especifique un nombre para su recurso compartido."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "¡La descripción contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "El volumen contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "La ruta contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "La opción contiene caracteres no validos."
 
@@ -11808,72 +11832,72 @@ msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr "Nuevo dispositivo"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr "Plantilla de terminal para"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr "La estación de trabajo se está instalando"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr "la estación de trabajo esta esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr "Ha fallado la instalación de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr "El servidor está esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr "Ha fallado la instalación del servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr "Dispositivo de Red"
 
@@ -12101,39 +12125,39 @@ msgstr "Por favor especifique un valor numérico para expiración."
 msgid "Please specify a numeric value for retry."
 msgstr "Por favor especifique un valor numérico para reintento."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -12143,12 +12167,12 @@ msgstr ""
 "siempre que 'cn' no este presente en esta entrada. Posiblemente está "
 "actualmente creando una nueva plantilla de terminal"
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr "Eliminar extensión de impresión"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -12156,7 +12180,7 @@ msgstr ""
 "Esta estación de trabajo tiene la extensión impresora activada. Puede "
 "desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -12164,7 +12188,7 @@ msgstr ""
 "Este terminal tiene la extensión impresora activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -12172,7 +12196,7 @@ msgstr ""
 "Esta estación de trabajo tiene la extensión impresora desactivada. Puede "
 "activarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -12180,33 +12204,48 @@ msgstr ""
 "Este terminal tiene la extensión impresora desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr "no puedo acceder a la información PPD"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr "Ha fallado la eliminación de la impresora"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr "Ha fallado la grabación de la impresora"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Seleccionar una base"
@@ -12563,6 +12602,245 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Seleccionar impresora ppd"
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "cabecera"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Papel desempeñado"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+#, fuzzy
+msgid "Required score must be a numeric value."
+msgstr "Días futuros debe ser un valor"
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como acción 'CHECK' para la extensión '%s' no "
+"parece existir."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión inventario activada. Puede desactivarla "
+"pulsando aquí."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión inventario desactivada. Puede activarla "
+"pulsando aquí."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Comprobar parámetros"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, fuzzy, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "El puerto sieve necesita ser un numero."
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Información genérica del usuario"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Bases de datos"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Bases de datos"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Seleccione números para añadir"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr ""
@@ -13729,6 +14007,12 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
+#~ msgid "Error while writing printer"
+#~ msgstr "¡Error mientras se guardaba la impresora"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "¡Error mientras se guardaban los parámetros de la impresora"
+
 #~ msgid ""
 #~ "This menu allows you to create, delete and edit selected departments. "
 #~ "Having a large size of departments, you might prefer the range selectors "

diff --git a/locale/fr/LC_MESSAGES/messages.mo b/locale/fr/LC_MESSAGES/messages.mo
index 21ea5430004b4c8311931d9d86769bd48c5505c2..63dd6bac80ca2cc6c2d807f8d65c28e6a105b086 100644 (file)
Binary files a/locale/fr/LC_MESSAGES/messages.mo and b/locale/fr/LC_MESSAGES/messages.mo differ

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 2addf7631a069e91e4b616b697429bfddfb20a52..2c01b8e55d32fa0f56ce11e00dd101564e956f69 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"PO-Revision-Date: 2006-07-11 11:23+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
+"PO-Revision-Date: 2006-08-06 20:51+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -115,7 +117,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -168,7 +170,7 @@ msgstr "Périphériques"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -278,39 +280,39 @@ msgstr "Sommaire"
 msgid "Packages"
 msgstr "Paquets"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Allemand"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Russe"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Français"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Anglais"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italien"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Polonais"
 
@@ -492,6 +494,7 @@ msgstr "Nom à afficher"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nom"
@@ -1018,7 +1021,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1114,6 +1117,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1130,7 +1134,7 @@ msgstr "Supprimer"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1166,9 +1170,9 @@ msgstr "Supprimer"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1184,13 +1188,16 @@ msgstr "Supprimer"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1479,7 +1486,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1491,16 +1498,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1852,7 +1862,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Le support de Kolab est activé"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2528,11 +2538,11 @@ msgstr "Configurer"
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "Erreur LDAP :"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -2540,7 +2550,7 @@ msgstr ""
 "Des problèmes avec le serveur LDAP on probablement provoqué la perte des "
 "changements. Veuillez vérifier votre serveur LDAP et ressayer"
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -2548,19 +2558,19 @@ msgstr ""
 "Veuillez vérifier vos données et corriger l'erreur. Cliquez sur 'OK' pour "
 "fermer cette fenètre."
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr "Une erreur s'est produite lors de l'execution de votre demande"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2570,19 +2580,19 @@ msgstr ""
 "d'utilisation par '%s'. Veuillez contacter cette personne afin de clarifier "
 "la situation."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
@@ -2692,12 +2702,12 @@ msgstr "Objet"
 msgid "Error while fetching source dn - aborted!"
 msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt!"
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Statut FAI inconnu %s"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2706,17 +2716,17 @@ msgstr ""
 "La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
 "rapport à l'équipe de GOsa."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2725,12 +2735,12 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3129,8 +3139,8 @@ msgstr "Adresses alternatives"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3163,6 +3173,8 @@ msgstr "Adresses alternatives"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3185,7 +3197,7 @@ msgstr "Ajouter en local"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3241,7 +3253,7 @@ msgstr "Liste des adresses de messagerie alternatives"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3258,7 +3270,7 @@ msgstr "Utilisation des Quota"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "non défini"
 
@@ -3614,7 +3626,7 @@ msgstr "non configuré"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4257,27 +4269,29 @@ msgstr "La sauvegarde du compte Samba à échoué"
 msgid "User environment settings"
 msgstr "Utiliser les préférences d'environnement"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 "Veuillez indiquer un nom valide. Seul les chiffres de 0 à 9 et les lettres "
 "de a à Z sont permises."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Caractères invalides dans la description. Veuillez indiquer une description "
 "valide."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr "Veuillez indiquer un id valide."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr "Une entrée avec ce nom existe déjà."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr "Veuillez sélectionner une entrée ou cliquez sur annuler."
 
@@ -4316,11 +4330,11 @@ msgstr "Expression régulière concordant avec les noms des périphériques hotp
 msgid "Please select a printer or press cancel."
 msgstr "Veuillez sélectionner une imprimante ou cliquez sur annuler."
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr "automatique"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4331,34 +4345,34 @@ msgstr ""
 "Vous avez spécifié un hook externe qui ne peut pas être lu, veuillez "
 "vérifier les permissions du fichier '%s'."
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr "Enlever l'extension d'environnement"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Extension d'environnement activée. Vous pouvez la désactiver en cliquant sur "
 "le bouton ci-dessous."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr "Ajouter une extension d'environnement"
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Extension d'environnement désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -4366,31 +4380,31 @@ msgstr ""
 "Extension d'environnement désactivée. Vous devez d'abord créer un compte "
 "posix avant de pouvoir activer cette extension."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Aucun"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr "Veuillez indiquer un point de montage valide."
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr "Réinitialiser le mot de passe"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr "Supprimer ce partage"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -4399,15 +4413,15 @@ msgstr ""
 "Le profil kiosk sélectionné '%s' n'est plus disponible, le profil actuel est "
 "changé en 'aucun'."
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr "La suppression de l'extension d'environnement à échoué"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr "Veuillez indiquer un quota valide pour le profil."
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -4415,35 +4429,25 @@ msgstr ""
 "Vous devez configurer correctement l'extension posix pour activer "
 "l'extension d'environnement."
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Impossible de sauver de nouveaux profiles kiosk, je n'ai pas les droits sur "
 "le répertoire"
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr "Une erreur s'est produite lors de la sauvegarde de l'imprimante"
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr ""
-"Une erreur s'est produite lors de la sauvegarde des paramètres de "
-"l'imprimante"
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr "L'ajout de l'extension d'environnement à échoué"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr "partage de groupe"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Imprimante par défaut"
 
@@ -4653,9 +4657,17 @@ msgid "Device name"
 msgstr "Nom du périphérique"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
+msgstr "ID du vendeur"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "Identification du périphérique"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr "ID du produit"
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5682,28 +5694,28 @@ msgstr "recevoir"
 msgid "Removing blocklist object failed"
 msgstr "La suppression de l'objet blocklist à échoué"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Le champ obligatoire 'Nom' contient des caractères invalides"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr "Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr "La sauvegarde de l'objet blocklist à échoué"
 
@@ -5943,7 +5955,7 @@ msgstr "Soumettre le département"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5970,7 +5982,7 @@ msgstr "Editer un utilisateur"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6199,7 +6211,7 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Utilisateur"
@@ -7139,6 +7151,7 @@ msgstr "Affichage des logs système"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Téléchargement"
 
@@ -7160,9 +7173,9 @@ msgstr "La sauvegarde du script FAI à échoué"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr "Objets"
 
@@ -7680,7 +7693,7 @@ msgstr ""
 "Vous avez plus de 3 partitions primaires dans votre configuration, veuillez "
 "vérifier votre configuration."
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Liste des scripts"
 
@@ -7819,8 +7832,8 @@ msgid "List of FAI classes"
 msgstr "Liste des classes FAI"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
-msgstr "Ce tableau montre toutes les systèmes, dans l'arbre sélectionné."
+msgid "This table displays all FAL classes, in the selected tree."
+msgstr "Ce tableau montre toutes les classes FAI, dans l'arbre sélectionné."
 
 #: plugins/admin/fai/class_divListFai.inc:48
 msgid "This menu allows you to create, delete and edit FAI classes."
@@ -8210,8 +8223,8 @@ msgstr "Propriétaire"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8262,7 +8275,7 @@ msgstr "Autres"
 msgid "sticky"
 msgstr "permanent"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Liste des scripts de connexions"
 
@@ -8520,34 +8533,34 @@ msgstr "Applications"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr "couper"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr "copier"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8555,7 +8568,7 @@ msgid "Edit this entry"
 msgstr "Modifier cette entrée"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8852,7 +8865,7 @@ msgstr ""
 "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Modèle"
 
@@ -9096,7 +9109,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Nom de l'application"
 
@@ -9110,7 +9123,7 @@ msgid "Create new application"
 msgstr "Créer une nouvelle application"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Le nom de l'application à afficher (ex: en dessous des icônes)"
 
@@ -9170,13 +9183,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Gestion des applications"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Vous êtes sur le point de supprimer l'application '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
 
@@ -9184,62 +9197,62 @@ msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
 msgid "no example"
 msgstr "pas d'exemple"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Ce 'dn' n'est pas une application."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "La suppression de l'application à échoué"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr "La suppression de l'application du groupe d'objet '%s' à échoue"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "La suppression de l'application du groupe '%s' à échoué"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "L'image spécifiée n'as pas été télé-chargée correctement."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr "Le répertoire d'éxecutiondoit commencer par '/'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Vous n'avez pas les droits suffisants pour créer une application dans cette "
 "'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Caractère non valide dans le nom de l'application. Seul les caractères de a-"
 "z et 0-9 sont permis."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "Le champ obligatoire 'Exécuter' n'est pas rempli."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Une application ayant le même 'Nom' existe déjà."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr "La sauvegarde de l'application à échouée"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr "Préférences de l'application"
 
@@ -9366,7 +9379,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ".."
 
@@ -9423,8 +9436,8 @@ msgid "present"
 msgstr "présent"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9916,10 +9929,17 @@ msgstr "Client ICA"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9948,13 +9968,13 @@ msgstr "hérité"
 msgid "Bit"
 msgstr "Bit"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr "Choisissez le téléphone situé à coté du terminal"
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
@@ -9962,8 +9982,8 @@ msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
 "verticale."
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
@@ -9971,11 +9991,11 @@ msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
 "Horizontale."
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr "La sauvegarde des services de la station de travail à échoué"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, fuzzy, php-format
 msgid ""
@@ -9985,7 +10005,7 @@ msgstr ""
 "La commande '%s', spécifié comme KERNELS hook de l'extension '%s' n'existe "
 "pas."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9993,11 +10013,11 @@ msgstr ""
 "Il y à des paquets dans votre configuration, qui ne peuvent pas être trouvés "
 "avec les paramètres de serveur/version actuels."
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Veuillez sélectionner un 'serveur FAI' ou effacer les 'Classes FAI'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -10005,7 +10025,7 @@ msgstr ""
 "Il y a déjà un profil dans votre sélection qui contient des configurations "
 "de table de partitions."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -10014,7 +10034,7 @@ msgstr ""
 "Impossible de trouver une ou plusieurs des classes FAI [%s] dans le serveur "
 "FAI '%s'. le serveur à été remis en 'auto'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -10027,16 +10047,16 @@ msgstr ""
 "Toutes les classes on été enlevées de ce compte, cliquez sur annuler si vous "
 "ne voulez pas sauver ceci."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr "La sauvegarde des paramètres de démarrage pour la station de travail à échoué"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "Impossible d'exécuter REPOSITORY_HOOK '%s' veuillez vérifier votre gosa.conf."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10548,7 +10568,7 @@ msgstr "Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10652,7 +10672,7 @@ msgid "New Terminal template"
 msgstr "Nouveau modèle de terminal"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr "Nouveau terminal"
 
@@ -10661,7 +10681,7 @@ msgid "New Workstation template"
 msgstr "Nouveau modèle de station de travail"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr "Nouvelle station de travail"
 
@@ -10759,31 +10779,31 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Veuillez entrer un chemin valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Veuillez spécifier un nom valide pour votre partage."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Veuillez spécifier un nom pour votre partage."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "La description contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "Le nom du Volume contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "Le chemin contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "L'option contient des caractères invalides."
 
@@ -12005,72 +12025,72 @@ msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives aux "
 "composant '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr "Nouveau périphérique"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr "Modèle de terminal pour "
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr "Nouveau système depuis l'arrivée"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr "La station de travail s'installe"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr "La station de travail attend une action"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr "L'installation de la station de travail à échoué"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr "Le serveur s'installe"
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr "Le serveur attend une action"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr "L'installation du serveur à échoué"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr "Stations Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr "Périphérique réseau"
 
@@ -12308,23 +12328,23 @@ msgstr "Veuillez spécifier un nombre pour la durée d'expiration."
 msgid "Please specify a numeric value for retry."
 msgstr "Veuillez spécifier un nombre pour la durée entre chaque essai."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 "Impossible d'obtenir un base valide depuis le dn de l'objet, je met la base "
 "à '%s'. "
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr "Ajouter une extension d'imprimante"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
@@ -12332,19 +12352,19 @@ msgstr ""
 "Impossible d'initialiser l'onglet imprimante, le paramètre parent était "
 "manquant pendant la construction."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Ce 'dn' n'a pas d'extensions d'impression."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -12354,12 +12374,12 @@ msgstr ""
 "tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
 "occupé à créer un nouveau modèle de terminal"
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr "Enlever l'extension d'impression"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -12367,7 +12387,7 @@ msgstr ""
 "Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
 "désactiver en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -12375,7 +12395,7 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -12383,7 +12403,7 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -12391,37 +12411,52 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr "Impossible d'obtenir les informations sur le fichier ppd."
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 "Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
 "nom."
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
 "changer son nom."
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr "La suppression de l'imprimante à échoué"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr "La sauvegarde de l'imprimante à échoué"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr "Type d'imprimante illégale lors de l'ajout de '%s' à la liste des imprimantes '%s',"
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr "Impossible d'ajouter '%s' à la liste des membres, il est déjà utilisé."
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr "Impossible d'ajouter '%s' à la liste des membres, il n'est pas accessible."
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Choisissez une base"
@@ -12787,6 +12822,225 @@ msgstr "Le vendeur sélectionné '%s' n'existe pas dans notre liste de ppds."
 msgid "Printer ppd selection."
 msgstr "Sélection du ppd de votre imprimante."
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+msgid "Rewrite header"
+msgstr "Récrire l'entête"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr "Score requis"
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr "Sélectionner le score requis pour marquer ce message comme étant un spam"
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr "Activer l'utilisation de la méthode de filtrage bayesienne"
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr "Activer l'apprentissage automatique pour la méthode bayesienne"
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr "Activer les vérification RBL"
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr "Activer l'utilisation de Razor"
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr "Activer l'utilisation de DDC"
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr "Activer l'utilisation de Pyzer"
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+msgid "Rule"
+msgstr "Règle"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+msgid "Remove spamassassin extension"
+msgstr "Enlever l'extension spamassassin"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension spamassassin activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+msgid "Add spamassassin service"
+msgstr "Ajouter un service spamassassin"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension spamassassin désactivé. Vous pouvez l'activer en cliquant "
+"sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "La suppression du service spamassasin sur le serveur avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "La sauvegarde du service spamassassin sur le serveur avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+msgid "Required score must be a numeric value."
+msgstr "Le score requis doit être un nombre positif."
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, php-format
+msgid "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr "La commande '%s', utilisée dans le ACTION_HOOK de l'extension '%s' n'existe pas."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr "L'activation du statut pour le service spamassassin avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr "Antivirus"
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+msgid "Remove anti virus extension"
+msgstr "Enlever l'extension d'antivirus"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension antivirus activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+msgid "Add anti virus service"
+msgstr "Ajouter un service antivirus"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension d'antivirus désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "La suppression du service antivirus du serveur avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "La sauvegarde du service antivirus du serveur avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr "Nombre maximal de récursions"
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr "Nombre de processus maximum"
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+msgid "Maximum file size"
+msgstr "Taille maximum des fichiers"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr "Nombre maximum de récursions"
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr "Ratio maximum de compression"
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+msgid "Checks per day"
+msgstr "Vérifications par jour"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "Le valeur spécifiée pour '%s' doit être une numérique."
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr "L'activation du statut pour le service antivirus avec le dn '%s' à échoué."
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+msgid "Generic virus filtering"
+msgstr "Filtrage antivirus générique"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+msgid "Database user"
+msgstr "Base de données utilisateur"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+msgid "Database mirror"
+msgstr "Base de données mirroir"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr "URL du proxy http"
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+msgid "Select number of maximal threads"
+msgstr "Sélectionnez le nombre maximal de processus"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr "Nombre maximum de récursions dans les répertoires"
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr "Activer le deboguage"
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr "Activer la vérification de la messagerie"
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr "Vérification des archives"
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr "Activer la vérification des archives"
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr "Bloquer les archives encryptées"
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr "Récursions maximum"
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr "Il doit y avoir au moins un serveur NTP sélectionné."

diff --git a/locale/it/LC_MESSAGES/messages.mo b/locale/it/LC_MESSAGES/messages.mo
index 2116474d2bd617fe9af89973e9187d95c7b2c628..d47fd6e2529cf21771afdc899c06adb5521cbe4c 100644 (file)
Binary files a/locale/it/LC_MESSAGES/messages.mo and b/locale/it/LC_MESSAGES/messages.mo differ

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index c4a5701fabc245bb972329a8a97aec8a863c7143..051af99134c416f797d78672da0b67c0ad0dfef6 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Alessandro Amici <a.amici@bopen.it>\n"
-"POT-Creation-Date: 2003-09-19 13:41+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -118,7 +118,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -171,7 +171,7 @@ msgstr "Dispositivi"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -282,39 +282,39 @@ msgstr ""
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Russo"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Francese"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Inglese"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italiano"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 #, fuzzy
 msgid "Polish"
 msgstr "Inglese"
@@ -493,6 +493,7 @@ msgstr "Mostra il nome"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Cognome"
@@ -986,7 +987,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1075,6 +1076,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1091,7 +1093,7 @@ msgstr "Rimuovi"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1127,9 +1129,9 @@ msgstr "Rimuovi"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1145,13 +1147,16 @@ msgstr "Rimuovi"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1423,7 +1428,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1435,16 +1440,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1774,7 +1782,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Supporto per Kolab abilitato."
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2391,37 +2399,37 @@ msgstr "Configura"
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "Errore LDAP"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continua"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Modifica contatto"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2430,19 +2438,19 @@ msgstr ""
 "Stai per modificare il record LDAP '%s' che sembra essere in uso da '%s'. "
 "Contatta la persona interessata."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
@@ -2542,41 +2550,41 @@ msgstr "Oggetto"
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2979,8 +2987,8 @@ msgstr "Indirizzi alternativi"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3013,6 +3021,8 @@ msgstr "Indirizzi alternativi"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3035,7 +3045,7 @@ msgstr "Aggiungi localmente"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3091,7 +3101,7 @@ msgstr "Lista degli indirizzi alternativi"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3108,7 +3118,7 @@ msgstr "Utilizzo quota"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "non definito"
 
@@ -3463,7 +3473,7 @@ msgstr "non configurata"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4077,26 +4087,28 @@ msgstr ""
 msgid "User environment settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 #, fuzzy
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 #, fuzzy
 msgid "Please specify a valid id."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 #, fuzzy
 msgid "Please select an entry or press cancel."
 msgstr "Prego inserire un numero di telefono valido!"
@@ -4142,12 +4154,12 @@ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 msgid "Please select a printer or press cancel."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 #, fuzzy
 msgid "auto"
 msgstr "Rapporto"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4156,116 +4168,108 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 #, fuzzy
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 #, fuzzy
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 #, fuzzy
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
 msgid "None"
 msgstr "nessuno"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 #, fuzzy
 msgid "Reset password hash"
 msgstr "Cambia password"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 #, fuzzy
 msgid "Delete share entry"
 msgstr "Elimina questo record"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 #, fuzzy
 msgid "Adding environment information failed"
 msgstr "Modifica proprietà"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 #, fuzzy
 msgid "group share"
 msgstr "gruppi"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 #, fuzzy
 msgid "Administrator"
 msgstr "Amministrazione"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 #, fuzzy
 msgid "Default printer"
 msgstr "Permessi predefiniti"
@@ -4504,10 +4508,18 @@ msgid "Device name"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 #, fuzzy
 msgid "Device ID"
 msgstr "Dispositivi"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5534,28 +5546,28 @@ msgstr "ricevi"
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -5800,7 +5812,7 @@ msgstr "Imposta dipartimento"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5828,7 +5840,7 @@ msgstr "Modifica contatto"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6049,7 +6061,7 @@ msgstr ""
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
@@ -6986,6 +6998,7 @@ msgstr ""
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 #, fuzzy
 msgid "Download"
 msgstr "Dominio"
@@ -7009,9 +7022,9 @@ msgstr ""
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
 msgid "Objects"
 msgstr "Oggetto"
@@ -7559,7 +7572,7 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 #, fuzzy
 msgid "List of scripts"
 msgstr "Lista degli utenti"
@@ -7689,7 +7702,7 @@ msgid "List of FAI classes"
 msgstr "Scegli il tuo numero di telefono personale"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
+msgid "This table displays all FAL classes, in the selected tree."
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:48
@@ -8111,8 +8124,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8172,7 +8185,7 @@ msgstr "Filtri"
 msgid "sticky"
 msgstr "statico"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 #, fuzzy
 msgid "List of hook scripts"
 msgstr "Lista delle liste di blocchi"
@@ -8427,7 +8440,7 @@ msgstr "Applicazione"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 #, fuzzy
 msgid "cut"
@@ -8435,7 +8448,7 @@ msgstr "Esegui"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 #, fuzzy
 msgid "Cut this entry"
@@ -8443,21 +8456,21 @@ msgstr "Modifica questo record"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8465,7 +8478,7 @@ msgid "Edit this entry"
 msgstr "Modifica questo record"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8759,7 +8772,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr ""
 
@@ -9011,7 +9024,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Nome applicazione"
 
@@ -9027,7 +9040,7 @@ msgid "Create new application"
 msgstr "Crea estensioni per le applicazioni"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -9082,13 +9095,13 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
@@ -9097,60 +9110,60 @@ msgstr ""
 msgid "no example"
 msgstr "incompleto"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 #, fuzzy
 msgid "Removing application failed"
 msgstr "Elimina estensioni per le applicazioni"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, fuzzy, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Mostra gruppi di applicazioni"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 #, fuzzy
 msgid "Saving application failed"
 msgstr "Nome applicazione"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 #, fuzzy
 msgid "Application settings"
 msgstr "Opzioni applicazione"
@@ -9272,7 +9285,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ""
 
@@ -9330,8 +9343,8 @@ msgid "present"
 msgstr "presente"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9842,10 +9855,17 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9875,31 +9895,31 @@ msgstr ""
 msgid "Bit"
 msgstr "scrivere"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 #, fuzzy
 msgid "Saving workstation services failed"
 msgstr "Stampante"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -9907,31 +9927,31 @@ msgid ""
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 #, fuzzy
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9940,18 +9960,18 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 #, fuzzy
 msgid "Saving workstation startup settings failed"
 msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, fuzzy, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "Impossibile connettersi al server del database!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10460,7 +10480,7 @@ msgstr ""
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10563,7 +10583,7 @@ msgid "New Terminal template"
 msgstr "Terminal Server"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 #, fuzzy
 msgid "New Terminal"
 msgstr "Terminali"
@@ -10574,7 +10594,7 @@ msgid "New Workstation template"
 msgstr "Mostra workstation"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 #, fuzzy
 msgid "New Workstation"
 msgstr "Mostra workstation"
@@ -10689,37 +10709,37 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Rimuovi"
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 #, fuzzy
 msgid "Please specify a valid name for your share."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
 msgid "Please specify a name for your share."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 #, fuzzy
 msgid "Volume contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
@@ -11984,80 +12004,80 @@ msgstr ""
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 #, fuzzy
 msgid "New Device"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 #, fuzzy
 msgid "New System from incoming"
 msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 #, fuzzy
 msgid "Workstation installation failed"
 msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "Server is waiting for action"
 msgstr "Informazioni generali"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 #, fuzzy
 msgid "Server installation failed"
 msgstr "Opzioni applicazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 #, fuzzy
 msgid "Winstation"
 msgstr "Amministrazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 #, fuzzy
 msgid "Network Device"
 msgstr "Mostra dispositiva di rete"
@@ -12299,39 +12319,39 @@ msgstr "Specificare una dimenzione valida per le mail da rigettare."
 msgid "Please specify a numeric value for retry."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 #, fuzzy
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
@@ -12339,70 +12359,85 @@ msgid ""
 "template"
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 #, fuzzy
 msgid "Remove printer extension"
 msgstr "Elimina foto"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 #, fuzzy
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 #, fuzzy
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 #, fuzzy
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 #, fuzzy
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 #, fuzzy
 msgid "can't get ppd informations."
 msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 #, fuzzy
 msgid "Removing printer failed"
 msgstr "Imposta dipartimento"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 #, fuzzy
 msgid "Saving printer failed"
 msgstr "Imposta dipartimento"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
@@ -12776,6 +12811,233 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Impostazioni Unix"
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "leggere"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Ruolo"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Elimina foto"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr "Questa identià possiede estensioni Unix."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Dispositivi del client"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni Unix"
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Elimina estensioni Samba"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Account Kolab"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+msgid "Required score must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Elimina foto"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr "Questa identià possiede estensioni Unix."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Dispositivi del client"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni Unix"
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Elimina estensioni Samba"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Account Kolab"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+msgid "Maximum file size"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Parametro"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Informazioni generali"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Database"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Database"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Seleziona il numero da aggiungere"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr ""
@@ -14183,10 +14445,6 @@ msgstr "Benvenuto %s!"
 #~ msgid "Remove inventory service"
 #~ msgstr "Elimina contatto"
 
-#, fuzzy
-#~ msgid "Add inventory service"
-#~ msgstr "Dispositivi del client"
-
 #, fuzzy
 #~ msgid "Other devices"
 #~ msgstr "Dispositivi del client"

diff --git a/locale/messages.po b/locale/messages.po
index 874c8178d33fcf2d69467d2163dbd460a8a54049..e817d1acdaae8b9a740147957361a45d19eb3250 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -1,3 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: contrib/gosa.conf:4
 msgid "My account"
 msgstr ""
@@ -101,7 +119,7 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -154,7 +172,7 @@ msgstr ""
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -264,39 +282,39 @@ msgstr ""
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr ""
 
@@ -474,6 +492,7 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
@@ -949,7 +968,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1037,6 +1056,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr ""
 
@@ -1053,7 +1073,7 @@ msgstr ""
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1089,9 +1109,9 @@ msgstr ""
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1107,13 +1127,16 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1359,7 +1382,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1371,16 +1394,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1689,7 +1715,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr ""
 
@@ -2269,54 +2295,54 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -2414,41 +2440,41 @@ msgstr ""
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2819,8 +2845,8 @@ msgstr ""
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -2853,6 +2879,8 @@ msgstr ""
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -2875,7 +2903,7 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -2931,7 +2959,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -2948,7 +2976,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr ""
 
@@ -3284,7 +3312,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -3877,23 +3905,25 @@ msgstr ""
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr ""
 
@@ -3932,11 +3962,11 @@ msgstr ""
 msgid "Please select a printer or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -3945,105 +3975,97 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr ""
 
@@ -4253,9 +4275,17 @@ msgid "Device name"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr ""
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5247,28 +5277,28 @@ msgstr ""
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -5505,7 +5535,7 @@ msgstr ""
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5532,7 +5562,7 @@ msgstr ""
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -5746,7 +5776,7 @@ msgstr ""
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
@@ -6639,6 +6669,7 @@ msgstr ""
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr ""
 
@@ -6660,9 +6691,9 @@ msgstr ""
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr ""
 
@@ -7159,7 +7190,7 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr ""
 
@@ -7277,7 +7308,7 @@ msgid "List of FAI classes"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
+msgid "This table displays all FAL classes, in the selected tree."
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:48
@@ -7652,8 +7683,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -7704,7 +7735,7 @@ msgstr ""
 msgid "sticky"
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr ""
 
@@ -7948,34 +7979,34 @@ msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -7983,7 +8014,7 @@ msgid "Edit this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8261,7 +8292,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr ""
 
@@ -8492,7 +8523,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr ""
 
@@ -8506,7 +8537,7 @@ msgid "Create new application"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -8561,13 +8592,13 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
@@ -8575,58 +8606,58 @@ msgstr ""
 msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr ""
 
@@ -8740,7 +8771,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ""
 
@@ -8796,8 +8827,8 @@ msgid "present"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9287,10 +9318,17 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9319,30 +9357,30 @@ msgstr ""
 msgid "Bit"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -9350,30 +9388,30 @@ msgid ""
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9382,17 +9420,17 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -9878,7 +9916,7 @@ msgstr ""
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -9977,7 +10015,7 @@ msgid "New Terminal template"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr ""
 
@@ -9986,7 +10024,7 @@ msgid "New Workstation template"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr ""
 
@@ -10083,31 +10121,31 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr ""
 
@@ -11260,72 +11298,72 @@ msgstr ""
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr ""
 
@@ -11547,101 +11585,116 @@ msgstr ""
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
 "template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr ""
@@ -11982,6 +12035,218 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr ""
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+msgid "Rewrite header"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+msgid "Rule"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+msgid "Remove spamassassin extension"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+msgid "Add spamassassin service"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+msgid "Required score must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+msgid "Remove anti virus extension"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+msgid "Add anti virus service"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+msgid "Maximum file size"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+msgid "Checks per day"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+msgid "Generic virus filtering"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+msgid "Database user"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+msgid "Database mirror"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+msgid "Select number of maximal threads"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr ""

diff --git a/locale/nl/LC_MESSAGES/messages.mo b/locale/nl/LC_MESSAGES/messages.mo
index d0a5f17856c8135b87bfa195d82671b45aa7d9ea..dfe21f2cfbae3fb7c1342a3fdb4896b60069de43 100644 (file)
Binary files a/locale/nl/LC_MESSAGES/messages.mo and b/locale/nl/LC_MESSAGES/messages.mo differ

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index b7005486dc415a6deaeeb0778a3680d4c7f32111..95e89bcfaf98dde8a1789896be426257bb25a253 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Alfred Schröder <schroeder@gonicus.de>\n"
-"POT-Creation-Date: 2003-09-19 13:41+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -122,7 +122,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -175,7 +175,7 @@ msgstr "Apparaten"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -285,39 +285,39 @@ msgstr "Samenvatting"
 msgid "Packages"
 msgstr "Pakketten"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Duits"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Spaans"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Frans"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Engels"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italiaans"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Pools"
 
@@ -501,6 +501,7 @@ msgstr "Getoonde naam"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Naam"
@@ -1027,7 +1028,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1123,6 +1124,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1139,7 +1141,7 @@ msgstr "Verwijderen"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1175,9 +1177,9 @@ msgstr "Verwijderen"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1193,13 +1195,16 @@ msgstr "Verwijderen"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1492,7 +1497,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1504,16 +1509,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1883,7 +1891,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Kolab ondersteuning is ingeschakeld"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2557,11 +2565,11 @@ msgstr "Instellen"
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "LDAP fout:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -2570,7 +2578,7 @@ msgstr ""
 "verloren gegaan zijn. Controleer uw LDAP instellingen voor mogelijke fouten "
 "en probeer het opnieuw."
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -2578,19 +2586,19 @@ msgstr ""
 "Controleer uw invoer a.u.b. en verbeter de fout. Druk 'OK' om dit "
 "berichtvenster te sluiten."
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr "Er is een fout opgetreden bij het verwerken van uw aanvraag"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2600,19 +2608,19 @@ msgstr ""
 "gebruiker '%s'. Neem a.u.b. contact op met deze persoon om eea kort te "
 "sluiten."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
@@ -2723,12 +2731,12 @@ msgstr "Object"
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2737,17 +2745,17 @@ msgstr ""
 "Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
 "Rapporteer dit a.u.b. aan het GOsa team."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2756,12 +2764,12 @@ msgstr ""
 "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
 "beginnen met 'dn: ...' op regel %s"
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3157,8 +3165,8 @@ msgstr "Alternatieve adressen"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3191,6 +3199,8 @@ msgstr "Alternatieve adressen"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3213,7 +3223,7 @@ msgstr "Lokaal toevoegen"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3269,7 +3279,7 @@ msgstr "Lijst met alternatieve E-mail adressen"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3286,7 +3296,7 @@ msgstr "Quota gebruik"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "niet gedefiniëerd"
 
@@ -3638,7 +3648,7 @@ msgstr "niet geconfigureerd"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4261,24 +4271,26 @@ msgstr "Het opslaan van het Samba account is mislukt"
 msgid "User environment settings"
 msgstr "Gebruikersomgeving instellingen"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Geef a.u.b. een geldige naam op. Alleen a-Z 0-9 zijn toegestaan."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Ongeldig karakter in omschrijving. Geef a.u.b. een geldige omschrijving op."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr "Geef a.u.b. een geldige id op."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr "Er bestaat al een invoer met deze naam."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr "Selecteer a.u.b. een regel of druk op annuleren."
 
@@ -4317,11 +4329,11 @@ msgstr "Reguliere expressie voor      overeenkomende hotplugs"
 msgid "Please select a printer or press cancel."
 msgstr "Selecteer a.u.b. een printer of druk annuleren in"
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr "auto"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4332,34 +4344,34 @@ msgstr ""
 "U heeft een externe resolutie inhaker opgegeven, welke niet gelezen kan "
 "worden. Controleer a.u.b. de rechten op het bestand '%s'."
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr "Verwijder omgevingsmogelijkheden"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Omgevingsmogelijkheden zijn ingeschakeld. U kunt deze uitschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr "Voeg omgevingsmogelijkheden toe"
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Omgevingsmogelijkheden zijn uitgeschakeld. U kunt deze inschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -4367,31 +4379,31 @@ msgstr ""
 "Omgevingsmogelijkheden zijn uitgeschakeld. U dient een posix account aan te "
 "maken voordat u deze mogelijkheid in kunt schakelen."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Geen"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr "U moet een geldig mountpunt opgeven."
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr "Wachtwoord hashwaarde herstellen"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr "Verwijder share regel"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -4400,15 +4412,15 @@ msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr "Het verwijderen van omgevings informatie is mislukt"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr "Geef a.u.b. een geldige profiel quota grootte op."
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -4416,33 +4428,25 @@ msgstr ""
 "U dient posix mogelijkheden in te schakelen om omgevingsmogelijkheden in te "
 "kunnen schakelen."
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Kan de nieuwe kios profielen niet opslaan. Mogelijk is de toegang geweigerd "
 "tot de directory"
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr "Fout bij het schrijven van de printer"
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr "Fout bij het schrijven van de printer instellingen"
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr "Het toevoegen van omgevings informatie is mislukt"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr "groepsshare"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Standaard printer"
 
@@ -4652,9 +4656,18 @@ msgid "Device name"
 msgstr "Apparaat naam"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Vendor ID"
+msgstr "Afzender ID"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "Apparaat ID"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5675,29 +5688,29 @@ msgstr "ontvangen"
 msgid "Removing blocklist object failed"
 msgstr "Het verwijderen van het blokeerlijst object is mislukt"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "U heeft geen toestemming een blokkeerlijst aan te maken onder deze 'basis'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Vereist veld 'Naam' bevat ongeldige karakters"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr "Geen toestemming om een blokkeerlijst aan te maken onder deze basis."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr "Het opslaan van het blokkeerlijst object is mislukt"
 
@@ -5937,7 +5950,7 @@ msgstr "Verwerk afdeling"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5964,7 +5977,7 @@ msgstr "Bewerk gebruiker"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6188,7 +6201,7 @@ msgstr "Fax ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Gebruiker"
@@ -7123,6 +7136,7 @@ msgstr "Systeem log weergave"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Downloaden"
 
@@ -7144,9 +7158,9 @@ msgstr "Het opslaan van het FAI script is mislukt"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr "Objecten"
 
@@ -7667,7 +7681,7 @@ msgstr ""
 "U heeft meer dan 3 primaire partitietabel regels in uw configuratie. "
 "Controleer uw configuratie a.u.b. nogmaals."
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Lijst met scripts"
 
@@ -7810,7 +7824,8 @@ msgid "List of FAI classes"
 msgstr "Lijst met FAI klassen"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
+#, fuzzy
+msgid "This table displays all FAL classes, in the selected tree."
 msgstr "Deze tabel toont alle systemen in de geselecteerde tree"
 
 #: plugins/admin/fai/class_divListFai.inc:48
@@ -8199,8 +8214,8 @@ msgstr "Eigenaar"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8251,7 +8266,7 @@ msgstr "Anderen"
 msgid "sticky"
 msgstr "sticky"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Lijst met inhakers scripts"
 
@@ -8508,34 +8523,34 @@ msgstr "Programma"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr "knippen"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr "kopieer"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8543,7 +8558,7 @@ msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8838,7 +8853,7 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -9083,7 +9098,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Programmanaam"
 
@@ -9097,7 +9112,7 @@ msgid "Create new application"
 msgstr "Nieuw programma aanmaken"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Te tonen programma naam (bv. onder iconen)"
 
@@ -9155,13 +9170,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Programma beheer"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "U staat op het punt de programma '%s' te verwijderen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "U heeft geen toestemming dit programma te verwijderen"
 
@@ -9169,59 +9184,59 @@ msgstr "U heeft geen toestemming dit programma te verwijderen"
 msgid "no example"
 msgstr "geen voorbeeld"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Deze 'dn' is geen programma."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "Het verwijderen van het programma is mislukt"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr "Het verwijderen van het programma van objectgroep '%s' is mislukt"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Het opgegeven plaatje is niet correct ge-upload"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr "Het opgegeven uitvoerpad moet met een '/' starten."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "U heeft geen toestemming een programma aan te maken onder deze 'Basis'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "Vereiste veld 'Naam' is leeg."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr "Ongeldig karakter in programmanaam. Alleen a-Z 0-9 zijn toegestaan."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "Vereist veld 'Uitvoeren' is leeg."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Er is al een programma met deze 'Naam'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr "Het opslaan van het programma is mislukt"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr "Programma instellingen"
 
@@ -9344,7 +9359,7 @@ msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen."
 msgid "You have no permission to remove this department."
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ".."
 
@@ -9405,8 +9420,8 @@ msgid "present"
 msgstr "aanwezig"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9901,10 +9916,17 @@ msgstr "ICA client"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9933,30 +9955,30 @@ msgstr "overerfd"
 msgid "Bit"
 msgstr "Bit"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr "Geef a.u.b. een geldig VSync bereik op."
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr "Geef a.u.b. een geldig HSync bereik op."
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr "Het opslaan van werkstations services is mislukt"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -9966,7 +9988,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als KERNELS inhaker voor module '%s' "
 "bestaat niet."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9974,11 +9996,11 @@ msgstr ""
 "Er bestaan pakketten in uw configuratie, die niet gekoppeld kunnen worden "
 "aan de huidige server/distributie instellingen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Selecteer a.u.b. een 'FAI server' of  verwijder de 'FAI klasses'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9986,7 +10008,7 @@ msgstr ""
 "Er bestaat al een profiel in uw selectie die partitietabel configuraties "
 "bevat."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9995,7 +10017,7 @@ msgstr ""
 "Kon een of meer van de opgegeven FAI klasse(n) [%s] niet vinden op de FAI "
 "server '%s'. De server is teruggezet op 'auto'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -10008,11 +10030,11 @@ msgstr ""
 "hernoemd zijn. Alle klassen zijn verwijderd van dit account. Druk op "
 "annuleren indien u deze wijzigingen niet wenst op te slaan."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr "Het opslaan van de werkstation opstart instellingen is mislukt"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
@@ -10020,7 +10042,7 @@ msgstr ""
 "Kan de opgegeven REPOSITORY_HOOK '%s' niet uitvoeren. Controleer uw gosa."
 "conf a.u.b."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10535,7 +10557,7 @@ msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10639,7 +10661,7 @@ msgid "New Terminal template"
 msgstr "Nieuw terminal sjabloon"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr "Nieuwe terminal"
 
@@ -10648,7 +10670,7 @@ msgid "New Workstation template"
 msgstr "Nieuw werkstation sjabloon"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr "Nieuw werkstation"
 
@@ -10749,31 +10771,31 @@ msgstr ""
 "Kan bestand '/etc/gosa/encodings' niet openen. Controlleer de "
 "bestandspermissies a.u.b."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Geef a.u.b. een geldig pad op voor uw instellingen."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Geef a.u.b. een geldige naam op voor uw share."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Geef a.u.b. een naam op voor uw share."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "De omschrijving bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "Het volume bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "Het pad bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "De optie bevat ongeldige karakters."
 
@@ -12008,72 +12030,72 @@ msgstr ""
 "U staat op het punt alle informatie over dit component op '%s' te "
 "verwijderen."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr "Nieuw apparaat"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr "Terminal sjabloon voor"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr "Werkstation wordt momenteel geinstalleerd"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr "Werkstation wacht op gebruikersactie"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr "Werkstation installatie mislukt"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr "Server wordt momenteel geinstalleerd"
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr "Server wacht op gebruikersactie"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr "Server installatie mislukt"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr "Windows werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr "Netwerk apparaat"
 
@@ -12311,42 +12333,42 @@ msgstr "Geef a.u.b. een nummerieke waarde op voor verval."
 msgid "Please specify a numeric value for retry."
 msgstr "Geef a.u.b. een nummerieke waarde op voor opnieuw proberen."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 "Kon geen geldige basis ophalen uit de dn van het object. Basis is ingesteld "
 "op '%s'."
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr "Voeg printer extensie toe"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 "Kon de printertab niet initialiseren. Parameter parent ontbrak bij aanmaak."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Deze 'dn' heeft geen printer mogelijkheden."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -12356,12 +12378,12 @@ msgstr ""
 "inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
 "dat u een nieuwe terminal sjabloon aan het maken bent."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr "Verwijder printer mogelijkheden"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -12369,7 +12391,7 @@ msgstr ""
 "Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -12377,7 +12399,7 @@ msgstr ""
 "Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -12385,7 +12407,7 @@ msgstr ""
 "Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -12393,35 +12415,50 @@ msgstr ""
 "Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr "kan de PPD informatie niet ophalen"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 "Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr "Het verwijderen van de printer is mislukt"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr "Het opslaan van de printer is mislukt"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Selecteer een basis"
@@ -12790,6 +12827,245 @@ msgstr "De geselecteerde fabricant '%s' bestaat niet in onze lijst met ppds."
 msgid "Printer ppd selection."
 msgstr "Printer PPD selectie"
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "header"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Funktie"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Verwijder printer mogelijkheden"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Voeg Kolab service toe"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft Kolab mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Het opslaan van het Kolab account is mislukt"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+#, fuzzy
+msgid "Required score must be a numeric value."
+msgstr "Toekomstige dagen moet een waarde bevatten."
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
+"bestaat niet."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Verwijder printer mogelijkheden"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Voeg Kolab service toe"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Het opslaan van het Kolab account is mislukt"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "E-mail grootte"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Controleer parameter"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, fuzzy, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "De sieve poort dient nummeriek te zijn."
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Algemene gebruikersinformatie"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Databases"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Database"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Selecteer de toe te voegen nummers"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr "Er moet tenminste een NTP server geselecteerd zijn."
@@ -13984,6 +14260,12 @@ msgstr "Het GOsa team"
 msgid "Welcome %s!"
 msgstr "Welkom %s!"
 
+#~ msgid "Error while writing printer"
+#~ msgstr "Fout bij het schrijven van de printer"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "Fout bij het schrijven van de printer instellingen"
+
 #~ msgid ""
 #~ "This menu allows you to create, delete and edit selected departments. "
 #~ "Having a large size of departments, you might prefer the range selectors "

diff --git a/locale/pl/LC_MESSAGES/messages.mo b/locale/pl/LC_MESSAGES/messages.mo
index 83aaac55863717458776775e7d3bae5574e73ea0..a69803359dd25d45ceb202406fceee184883ded4 100644 (file)
Binary files a/locale/pl/LC_MESSAGES/messages.mo and b/locale/pl/LC_MESSAGES/messages.mo differ

diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po
index d532607bea53080af1010a71d12273e37b00a467..fec5c53add93f57b8578c2f33262406974a5cedf 100644 (file)
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2006-06-08 02:33+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -116,7 +117,7 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -169,7 +170,7 @@ msgstr "Urządzenia"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -279,39 +280,39 @@ msgstr "Podsumowanie"
 msgid "Packages"
 msgstr "Pakiety"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Niemiecki"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Francuski"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Angielski"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Włoski"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Polski"
 
@@ -493,6 +494,7 @@ msgstr "Wyświetl nazwę"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Imię"
@@ -1009,7 +1011,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1103,6 +1105,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1119,7 +1122,7 @@ msgstr "Usuń"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1155,9 +1158,9 @@ msgstr "Usuń"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1173,13 +1176,16 @@ msgstr "Usuń"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1464,7 +1470,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1476,16 +1482,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1824,7 +1833,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Wsparcie dla Kolab włączone"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2479,11 +2488,11 @@ msgstr "Konfiguruj"
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "błąd LDAP:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -2492,7 +2501,7 @@ msgstr ""
 "zmiany. Proszę sprawdzić konfiguracje LDAP w poszukiwaniu możliwych błędów i "
 "spróbować ponownie."
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -2500,19 +2509,19 @@ msgstr ""
 "Proszę sprawdzić wprowadzane dane i poprawić błąd. Naciśnij 'OK' aby zamknąć "
 "to okno."
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr "Wystąpił błąd podczas wykonywania żądania"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2521,19 +2530,19 @@ msgstr ""
 "Zamierzasz edytować wpis LDAP '%s' który wydaje się być używany przez '%s'. "
 "Proszę skontaktować się z osobą aby wyjaśnić postępowanie."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr "Wpisów na stronie"
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
@@ -2643,12 +2652,12 @@ msgstr "Obiekt"
 msgid "Error while fetching source dn - aborted!"
 msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Nieznany FAIstate %s"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2657,17 +2666,17 @@ msgstr ""
 "Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
 "skontaktować się z zespołem GOsa."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2676,12 +2685,12 @@ msgstr ""
 "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
 "'dn: ...' w linii %s"
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "dn: '%s' (od linii %s) już istnieje w bazie LDAP"
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
@@ -3061,8 +3070,8 @@ msgstr "Adresy alternatywne"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3095,6 +3104,8 @@ msgstr "Adresy alternatywne"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3117,7 +3128,7 @@ msgstr "Dodaj lokalne"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3173,7 +3184,7 @@ msgstr "Lista alternatywnych adresów pocztowych"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3190,7 +3201,7 @@ msgstr "Użycie Quoty"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "nie zdefiniowane"
 
@@ -3534,7 +3545,7 @@ msgstr "nieskonfigurowane"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4146,23 +4157,25 @@ msgstr "Zapisywanie konta Samba nieudane"
 msgid "User environment settings"
 msgstr "Ustawienia środowiska użytkownika"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Proszę podać prawidłową nazwę. Tylko 0-9 a-Z są dopuszczalne."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Nieprawidłowy znak w opisie. Proszę podać prawidłowy opis."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr "Proszę podać prawidłowe id."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr "Wpis z tą nazwą już istnieje."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr "Proszę wybrać wpis lub nacisnąć Anuluj."
 
@@ -4201,11 +4214,11 @@ msgstr "Wyrażenie regularne dla dopasowania hotplug"
 msgid "Please select a printer or press cancel."
 msgstr "Proszę wybrać drukarkę lub nacisnąć Anuluj."
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 msgid "auto"
 msgstr "automatycznie"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4216,30 +4229,30 @@ msgstr ""
 "Podano zewnętrzny zaczep rozdzielczości którego nie można czytać, proszę "
 "sprawdzić uprawnienia pliku '%s'."
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 msgid "Remove environment extension"
 msgstr "Usuń rozszerzenie środowiska"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr "Rozszerzenie środowiska włączone. Można je wyłączyć klikając poniżej."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr "Dodaj rozszerzenie środowiska"
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr "Rozszerzenie środowiska wyłączone. Można je włączyć klikając poniżej."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -4247,31 +4260,31 @@ msgstr ""
 "Rozszerzenie środowiska wyłączone, Należy najpierw ustawić rozszerzenie "
 "posix."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Brak"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 msgid "You must specify a valid mount point."
 msgstr "Musisz podać prawidłowy punkt montowania."
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 msgid "Reset password hash"
 msgstr "Zresetuj hash hasła"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 msgid "Delete share entry"
 msgstr "Usuń wpis udziału"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -4280,48 +4293,40 @@ msgstr ""
 "Wybrany profil kiosk '%s' nie jest już dostępny, ustawiam aktualny profil na "
 "'brak'."
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr "Usuwanie informacji środowiska nieudane"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr "Proszę podać prawidłowy rozmiar quota dla profilu."
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 "Należy ustawić prawidłowe rozszerzenie posix aby włączyć cechy środowiska."
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Nie można zapisać nowych profili kiosk, prawdopodobnie brak uprawnień dla "
 "katalogu"
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr "Błąd podczas zapisywania drukarki"
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr "Błąd podczas zapisywania ustawień drukarki"
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 msgid "Adding environment information failed"
 msgstr "Dodawanie informacji środowiska nieudane"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "group share"
 msgstr "grupuj udział"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "Administrator"
 msgstr "Administrator"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Domyślna drukarka"
 
@@ -4531,9 +4536,18 @@ msgid "Device name"
 msgstr "Nazwa urządzenia"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Vendor ID"
+msgstr "ID nadawcy"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "ID urządzenia"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5544,28 +5558,28 @@ msgstr "odbieranie"
 msgid "Removing blocklist object failed"
 msgstr "Usuwanie obiektu bloklisty nieudane"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Wymaganie pole 'Nazwa' zawiera niedozwolone znaki"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "Podana nazwa jest już używana."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr "Zapisywanie obiektu bloklisty nieudane"
 
@@ -5805,7 +5819,7 @@ msgstr "Zatwierdź departament"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -5832,7 +5846,7 @@ msgstr "Edytuj użytkownika"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6052,7 +6066,7 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Użytkownik"
@@ -6975,6 +6989,7 @@ msgstr "Podgląd logu systemowego"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Ściągnij"
 
@@ -6996,9 +7011,9 @@ msgstr "Zapisywanie skryptu FAI nieudane"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 msgid "Objects"
 msgstr "Obiekty"
 
@@ -7513,7 +7528,7 @@ msgstr ""
 "Jest więcej niż 3 wpisy w podstawowej tablicy partycji. Proszę sprawdzić "
 "konfigurację."
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Lista skryptów"
 
@@ -7650,7 +7665,8 @@ msgid "List of FAI classes"
 msgstr "Nazwy klas FAI"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
+#, fuzzy
+msgid "This table displays all FAL classes, in the selected tree."
 msgstr "Ta tabela wyświetla wszystkie systemy w wybranym drzewie."
 
 #: plugins/admin/fai/class_divListFai.inc:48
@@ -8033,8 +8049,8 @@ msgstr "Właściciel"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8085,7 +8101,7 @@ msgstr "Inne"
 msgid "sticky"
 msgstr "sticky"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Lista zaczepionych slryptów"
 
@@ -8337,34 +8353,34 @@ msgstr "Aplikacja"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "cut"
 msgstr "wytnij"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr "kopiuj"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8372,7 +8388,7 @@ msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -8663,7 +8679,7 @@ msgstr ""
 "użycie szablonów."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Szablon"
 
@@ -8905,7 +8921,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Nazwa aplikacji"
 
@@ -8919,7 +8935,7 @@ msgid "Create new application"
 msgstr "Utwórz nową aplikację"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Wyświetlana nazwa aplikacji (pod ikoną)"
 
@@ -8976,13 +8992,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Zarządzanie aplikacją"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Zamierzasz usunąć aplikację '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "Brak uprawnień do usunięcia tej aplikacji!"
 
@@ -8990,58 +9006,58 @@ msgstr "Brak uprawnień do usunięcia tej aplikacji!"
 msgid "no example"
 msgstr "brak przykładu"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Ten 'dn' nie jest aplikacją."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "Usuwanie aplikacji nieudane"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr "Usuwanie aplikacji z grupy obiektów '%s' nieudane"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Usuwanie aplikacji z grupy '%s' nieudane"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Podany obrazek nie został wgrany prawidłowo."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr "Podana ścieżka wykonania musi zaczynać się od '/'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "Brak uprawnień do tworzenia aplikacji w tej 'bazie'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "Wymagane pole 'Nazwa' nie jest wypełnione."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr "Nieprawidłowe znaki w nazwie aplikacji. Dozwolone są tylko a-z 0-9."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "Wymagane pole 'Wykonanie' nie jest wypełnione."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Już istnieje aplikacja o takiej 'Nazwie'"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 msgid "Saving application failed"
 msgstr "Zapyisywanie aplikacji nieudane"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 msgid "Application settings"
 msgstr "Ustawienia Aplikacji"
 
@@ -9163,7 +9179,7 @@ msgstr "Zamierzasz usunąć całe poddrzewo LDAP umieszczone pod '%s'."
 msgid "You have no permission to remove this department."
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ".."
 
@@ -9222,8 +9238,8 @@ msgid "present"
 msgstr "obecne"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -9714,10 +9730,17 @@ msgstr "Klient ICA"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -9746,30 +9769,30 @@ msgstr "odziedziczony"
 msgid "Bit"
 msgstr "Bit"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr "Wybierz telefon umieszczony przy obecnym terminalu"
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr "Proszę podać prawidłowy parametr VSync"
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr "Proszę podać prawidłowy parametr HSync."
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 msgid "Saving workstation services failed"
 msgstr "Zapisywanie usług stacji roboczej nieudane"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
@@ -9778,7 +9801,7 @@ msgid ""
 msgstr ""
 "Polecenie '%s' podane jako zaczep KERNELS dla dodatku '%s' nie istnieje."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9786,11 +9809,11 @@ msgstr ""
 "Istnieją pakiety w twojej konfiguracji które nie mogą zostać przeanalizowane "
 "przy obecnych ustawieniach serwera/wydania."
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Proszę wybrać 'serwer FAI' lub usunąć 'klasy FAI'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9798,7 +9821,7 @@ msgstr ""
 "Już istnieje profil w twoim wyborze który zawiera konfiguracje tablicy "
 "partycji."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9807,7 +9830,7 @@ msgstr ""
 "Nie można przetłumaczyć jednej lub więcej klas FAI [%s] na serwerze FAI '%"
 "s'. Serwer zresetowano na 'auto'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9820,18 +9843,18 @@ msgstr ""
 "klasy zostały usunięte z tego konta, naciśnij anuluj jeśli nie chcesz tego "
 "zachować."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 msgid "Saving workstation startup settings failed"
 msgstr "Zapisywanie ustawień uruchamiania stacji roboczej nieudane"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 "Nie można wykonać podanego REPOSITORY_HOOK '%s' proszę sprawdzić gosa.conf."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10337,7 +10360,7 @@ msgstr "Wymagane pole 'Nazwa stacji roboczej' jest puste."
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10440,7 +10463,7 @@ msgid "New Terminal template"
 msgstr "Nowy szablon terminala"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 msgid "New Terminal"
 msgstr "Nowy terminal"
 
@@ -10449,7 +10472,7 @@ msgid "New Workstation template"
 msgstr "Nowy szablon stacji roboczej"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Workstation"
 msgstr "Nowa stacja robocza"
 
@@ -10548,31 +10571,31 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Nie można czytać '/etc/gosa/encodings', proszę sprawdzić uprawnienia."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Proszę podać prawidłową ścieżkę dla ustawień."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Proszę podać prawidłową nazwę doa udziału."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Proszę podać nazwę dla udziału."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "Opis zawiera nieprawidłowe znaki."
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "Wolumin zawiera nieprawidłowe znaki."
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "Ścieżka zawiera nieprawidłowe znaki."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "Opcja zawiera nieprawidłowe znaki."
 
@@ -11771,72 +11794,72 @@ msgstr "Brak uprawnień do ustalania tych haseł systemowych!"
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "Zamierzasz usunąć wszystkie informacje o komponencie w '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Nowy terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Nowa stacja robocza"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "New Device"
 msgstr "Nowe urządzenie"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 msgid "Terminal template for"
 msgstr "Szablon terminala dla"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Szablon stacji roboczej dla"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New System from incoming"
 msgstr "Nowy system dla nadchodzących"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "Workstation is installing"
 msgstr "Stacja robocza jest instalowana"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 msgid "Workstation is waiting for action"
 msgstr "Stacja robocza czeka na użycie"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Workstation installation failed"
 msgstr "Instalacja stacji roboczej nieudana"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr "Serwer jest instalowany"
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "Server is waiting for action"
 msgstr "Serwer czeka na użycie"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 msgid "Server installation failed"
 msgstr "Instalacja serwera nieudana"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 msgid "Winstation"
 msgstr "Stacja Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 msgid "Network Device"
 msgstr "Urządzenie sieciowe"
 
@@ -12069,22 +12092,22 @@ msgstr "Proszę podać liczbę jako wartość dla wygaśnięcia."
 msgid "Please specify a numeric value for retry."
 msgstr "Proszę podać liczbę jako wartość dla ponowienia."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 "Nie można wydobyć poprawnej podstawy z obiektu dn, ustawiam podstawę na '%s'."
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr "Dodaj rozszerzenie drukarki"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
@@ -12092,19 +12115,19 @@ msgstr ""
 "Nie można zainicjalizować zakładki drukarek, brak parametru parent podzczas "
 "tworzenia."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "To jest szablon stacji roboczej, zakładka drukarek jest wyłączona."
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "To jest szablon terminala, zakładka drukarek jest wyłączona."
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Ten 'dn' nie posiada cech drukarki."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -12114,12 +12137,12 @@ msgstr ""
 "'cn' nie jest obecne we wpisie. Prawdopodobnie próbujesz tworzyć nowy "
 "szablon terminala."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid "Remove printer extension"
 msgstr "Usuń rozszerzenie drukarki"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -12127,7 +12150,7 @@ msgstr ""
 "Ta stacja robocza ma włączone rozszerzenia drukarki. Można je wyłączyć "
 "klikając poniżej."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -12135,7 +12158,7 @@ msgstr ""
 "Ten terminal ma włączone rozszerzenia drukarki. Można je wyłączyć klikając "
 "poniżej."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -12143,7 +12166,7 @@ msgstr ""
 "Ta stacja robocza ma wyłączone rozszerzenia drukarki. Można je włączyć "
 "klikając poniżej."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -12151,36 +12174,51 @@ msgstr ""
 "Ten terminal ma wyłączone rozszerzenia drukarki. Można je włączyć klikając "
 "poniżej."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Wybrany plik PPD '%s' nie istnieje."
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 msgid "can't get ppd informations."
 msgstr "Nie można pobrać informacji ppd."
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 "Ta drukarka należy do terminala %s. Nie można zmienić nazwy tej drukarki."
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Ta drukarka należy do stacji roboczej %s. Nie można zmienić nazwy tej "
 "drulkarki."
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 msgid "Removing printer failed"
 msgstr "Usuwanie drukarki nieudane"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 msgid "Saving printer failed"
 msgstr "Zapisywanie drukarki nieudane"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Wybierz bazę"
@@ -12543,6 +12581,237 @@ msgstr "Wybrany dostawca '%s' nie istnieje w naszej liście ppd."
 msgid "Printer ppd selection."
 msgstr "Wybór ppd drukarki."
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "nagłówek"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Pełniona funkcja"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Usuń rozszerzenie drukarki"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr "Ten serwer posiada cechy kolab. Można je wyłączyć klikając poniżej"
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Dodaj usługę Kolab"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr "Ten serwer nie posiada cech kolab. Można je włączyć klikając poniżej."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Usuwanie konta ogólnego użytkownika nieudane"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Zapisywanie konta Kolab nieudane"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+#, fuzzy
+msgid "Required score must be a numeric value."
+msgstr "Przyszłe dni muszą być liczbą."
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr "Polecenie '%s' podane jako CHECK dla dodatku '%s' nie istnieje."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Usuń rozszerzenie drukarki"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ten serwer posiada cechy inwentarza. Można je wyłączyć klikając poniżej"
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Dodaj usługę Kolab"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ten serwer nie posiada cech inwentarza. Można je włączyć klikając poniżej."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Usuwanie konta ogólnego użytkownika nieudane"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Zapisywanie konta Kolab nieudane"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "Rozmiar poczty"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Sprawdź parametr"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, fuzzy, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "Port sieve musi być liczbą."
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Ogólne informacje o użytkowniku"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Bazy danych"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Baza"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Wybierz numery do dodania"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr "Musi być wybrany co najmniej jeden serwer NTP."
@@ -13719,6 +13988,12 @@ msgstr "Zespół GOsa"
 msgid "Welcome %s!"
 msgstr "Witaj %s!"
 
+#~ msgid "Error while writing printer"
+#~ msgstr "Błąd podczas zapisywania drukarki"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "Błąd podczas zapisywania ustawień drukarki"
+
 #~ msgid ""
 #~ "This menu allows you to create, delete and edit selected departments. "
 #~ "Having a large size of departments, you might prefer the range selectors "

diff --git a/locale/ru/LC_MESSAGES/messages.mo b/locale/ru/LC_MESSAGES/messages.mo
index 4982ea5182b4d2e01df1af5da00ad35613ff9efd..5bd5a056442449190265ca4e4abcb0178dbc12bf 100644 (file)
Binary files a/locale/ru/LC_MESSAGES/messages.mo and b/locale/ru/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 88cf0cafd6dc3bf4971b4008ff47d6abf7512168..e95cab0ce3f318af434816ea31c2e427d9a75bed 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Igor Muratov <migor@altlinux.org>\n"
-"POT-Creation-Date: 2004-06-01 13:40+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 12:58+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -117,7 +117,7 @@ msgstr "Факс"
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -171,7 +171,7 @@ msgstr "Устройства"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:762
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -290,39 +290,39 @@ msgstr ""
 msgid "Packages"
 msgstr "Показать телефоны"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 #, fuzzy
 msgid "Polish"
 msgstr "Английский"
@@ -509,6 +509,7 @@ msgstr "Отображаемое имя"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Фамилия"
@@ -1036,7 +1037,7 @@ msgstr ""
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1470
+#: ihtml/themes/default/setup_step4.tpl:114 include/functions.inc:1516
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
@@ -1131,6 +1132,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goSpamServer.tpl:37
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1147,7 +1149,7 @@ msgstr "Удалить"
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -1183,9 +1185,9 @@ msgstr "Удалить"
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/users/class_userManagement.inc:625
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -1201,13 +1203,16 @@ msgstr "Удалить"
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:489
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goSpamServerRule.tpl:24
+#: plugins/admin/systems/goVirusServer.tpl:146
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
@@ -1485,7 +1490,7 @@ msgstr ""
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -1497,16 +1502,19 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
 #: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/class_systemManagement.inc:487
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
@@ -1864,7 +1872,7 @@ msgstr "Поддержка Gofon отключена, не все схемы ус
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1130
 msgid "OK"
 msgstr "OK"
 
@@ -2509,37 +2517,37 @@ msgstr "Настроить"
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1108 include/functions.inc:1297
 msgid "LDAP error:"
 msgstr "Ошибка LDAP:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1109
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1071
+#: include/functions.inc:1117
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1080
+#: include/functions.inc:1126
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:1191
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Продолжить"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1193
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1195
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -2548,19 +2556,19 @@ msgstr ""
 "Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
 "\". Пожалуйста, обратитесь к пользователю и уточните отношения."
 
-#: include/functions.inc:1433
+#: include/functions.inc:1479
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1461
+#: include/functions.inc:1507
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1735
+#: include/functions.inc:1781
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1824
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -2663,12 +2671,12 @@ msgstr "Объект"
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:554 include/class_ldap.inc:568
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "состояние неизвестно"
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:711
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -2677,29 +2685,29 @@ msgstr ""
 "Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
 "об этом команде разработчиков GOsa."
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:780
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:782
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:978
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:982
+#: include/class_ldap.inc:991
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1007
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3110,8 +3118,8 @@ msgstr "Альтернативные адреса"
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/class_groupMail.inc:540
 #: plugins/admin/groups/group_objects.tpl:55
@@ -3144,6 +3152,8 @@ msgstr "Альтернативные адреса"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -3166,7 +3176,7 @@ msgstr "Добавить локально"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:624
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -3222,7 +3232,7 @@ msgstr "Список альтернативных адресов эл. почт
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/systems/class_systemManagement.inc:754
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -3239,7 +3249,7 @@ msgstr "Использование квоты"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "not defined"
 msgstr "не определена"
 
@@ -3596,7 +3606,7 @@ msgstr "Не настроено"
 
 #: plugins/personal/posix/class_posixAccount.inc:203
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:782
+#: plugins/admin/systems/class_workstationStartup.inc:766
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
@@ -4237,27 +4247,29 @@ msgstr ""
 msgid "User environment settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 #, fuzzy
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 #, fuzzy
 msgid "Please specify a valid id."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 #, fuzzy
 msgid "An Entry with this name already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 #, fuzzy
 msgid "Please select an entry or press cancel."
 msgstr "Введите корректный номер телефона!"
@@ -4303,12 +4315,12 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Please select a printer or press cancel."
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:192
 #, fuzzy
 msgid "auto"
 msgstr "Отношение"
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:214
 #: plugins/admin/systems/class_workstationService.inc:88
 #: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
@@ -4317,37 +4329,37 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:328
 #, fuzzy
 msgid "Remove environment extension"
 msgstr "Удалить параметры"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:329
 #, fuzzy
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:339
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:335
 #, fuzzy
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:340
 #, fuzzy
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
@@ -4356,85 +4368,77 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:761
+#: plugins/personal/environment/class_environment.inc:455
+#: plugins/personal/environment/class_environment.inc:771
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
 msgid "None"
 msgstr "нет"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:606
+#: plugins/personal/environment/class_environment.inc:538
+#: plugins/personal/environment/class_environment.inc:549
+#: plugins/admin/systems/class_workstationStartup.inc:590
 #: plugins/admin/systems/class_terminalStartup.inc:187
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_environment.inc:601
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:610
 #: plugins/personal/environment/class_environment.inc:611
+#: plugins/personal/environment/class_environment.inc:612
+#: plugins/personal/environment/class_environment.inc:620
+#: plugins/personal/environment/class_environment.inc:621
 #, fuzzy
 msgid "Reset password hash"
 msgstr "Изменить пароль"
 
-#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:625
 #, fuzzy
 msgid "Delete share entry"
 msgstr "Удалить"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:774
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:815
+#: plugins/personal/environment/class_environment.inc:825
 #, fuzzy
 msgid "Removing environment information failed"
 msgstr "Удалить параметры"
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:878
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/personal/environment/class_environment.inc:875
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1027
-msgid "Error while writing printer"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1166
+#: plugins/personal/environment/class_environment.inc:1067
 #, fuzzy
 msgid "Adding environment information failed"
 msgstr "Изменить свойства"
 
-#: plugins/personal/environment/class_environment.inc:1179
+#: plugins/personal/environment/class_environment.inc:1080
 #, fuzzy
 msgid "group share"
 msgstr "группы"
 
-#: plugins/personal/environment/class_environment.inc:1211
+#: plugins/personal/environment/class_environment.inc:1112
 #, fuzzy
 msgid "Administrator"
 msgstr "Администрирование"
 
-#: plugins/personal/environment/class_environment.inc:1216
+#: plugins/personal/environment/class_environment.inc:1117
 msgid "Default printer"
 msgstr "Принтер по умолчанию"
 
@@ -4676,9 +4680,18 @@ msgstr "Имя сервера"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
 #, fuzzy
+msgid "Vendor ID"
+msgstr "Идентификатор отправителя"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
+#, fuzzy
 msgid "Device ID"
 msgstr "Устройства"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -5735,28 +5748,28 @@ msgstr "получение"
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Значение поля 'Имя' содержит недопустимые символы."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "Указанное имя уже используется."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
 msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -6007,7 +6020,7 @@ msgstr "Показать подразделения"
 #: plugins/admin/fai/class_divListFai.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
@@ -6036,7 +6049,7 @@ msgstr "Пользователи домена"
 #: plugins/admin/fai/class_divListFai.inc:216
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
@@ -6267,7 +6280,7 @@ msgstr "Идентификатор факса"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:781
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Пользователь"
@@ -7245,6 +7258,7 @@ msgstr "Просмотр системного журнала"
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 #, fuzzy
 msgid "Download"
 msgstr "Домен"
@@ -7270,9 +7284,9 @@ msgstr "Атрибуты UNIX"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
 msgid "Objects"
 msgstr "Объект"
@@ -7838,7 +7852,7 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 #, fuzzy
 msgid "List of scripts"
 msgstr "Список пользователей"
@@ -7969,8 +7983,9 @@ msgid "List of FAI classes"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
+#, fuzzy
+msgid "This table displays all FAL classes, in the selected tree."
+msgstr "Приложение с таким именем уже существует."
 
 #: plugins/admin/fai/class_divListFai.inc:48
 msgid "This menu allows you to create, delete and edit FAI classes."
@@ -8405,8 +8420,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:776
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -8466,7 +8481,7 @@ msgstr "Фильтры"
 msgid "sticky"
 msgstr "Состояние"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 #, fuzzy
 msgid "List of hook scripts"
 msgstr "Стоп-листы"
@@ -8725,7 +8740,7 @@ msgstr "Приложение"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 #, fuzzy
 msgid "cut"
@@ -8733,7 +8748,7 @@ msgstr "Выполнить"
 
 #: plugins/admin/groups/class_divListGroup.inc:145
 #: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:153
 #: plugins/admin/ogroups/class_divListOGroup.inc:133
 #, fuzzy
 msgid "Cut this entry"
@@ -8741,21 +8756,21 @@ msgstr "Редактиовать объект"
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/applications/class_divListApplication.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:135
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
 #: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -8764,7 +8779,7 @@ msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -9077,7 +9092,7 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Template"
 msgstr "Шаблон"
 
@@ -9347,7 +9362,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
+#: plugins/admin/applications/class_applicationGeneric.inc:458
 msgid "Application name"
 msgstr "Приложение"
 
@@ -9363,7 +9378,7 @@ msgid "Create new application"
 msgstr "Создать приложения"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:463
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Имя приложения, которое будет показано пользователям (например, под "
@@ -9424,13 +9439,13 @@ msgstr ""
 msgid "Application management"
 msgstr "Управление приложениями"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "У вас недостаточно прав для удаления этого приложения!"
 
@@ -9439,60 +9454,60 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid "no example"
 msgstr "не полный"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Это DN соответствует не приложению."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 #, fuzzy
 msgid "Removing application failed"
 msgstr "Удалить приложения"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, fuzzy, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Показать группы приложений"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Указанное изображение было загружено некорректно."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "У вас недостаточно прав для создания приложения в этой ветке."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "Обязательное поле \"Выполнить\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:429
 #, fuzzy
 msgid "Saving application failed"
 msgstr "Приложение"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:454
 #, fuzzy
 msgid "Application settings"
 msgstr "Параметры приложения"
@@ -9618,7 +9633,7 @@ msgstr "Вы собираетесь удалить целую ветку LDAP с
 msgid "You have no permission to remove this department."
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ""
 
@@ -9676,8 +9691,8 @@ msgid "present"
 msgstr "присутствует"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:465
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
@@ -10194,10 +10209,17 @@ msgstr "Клиент ICA"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:781
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:272
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:294
+#: plugins/admin/systems/class_workstationStartup.inc:765
 #: plugins/admin/systems/class_workstationGeneric.inc:118
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
@@ -10227,32 +10249,32 @@ msgstr ""
 msgid "Bit"
 msgstr "запись"
 
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 #: plugins/admin/systems/class_terminalService.inc:303
 #, fuzzy
 msgid "Choose the phone located at the current terminal"
 msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
 msgid "Please specify a valid VSync range."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
-#: plugins/admin/systems/class_workstationService.inc:422
+#: plugins/admin/systems/class_workstationService.inc:433
 #, fuzzy
 msgid "Saving workstation services failed"
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:315
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #, fuzzy, php-format
 msgid ""
@@ -10261,18 +10283,18 @@ msgid ""
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: plugins/admin/systems/class_workstationStartup.inc:416
+#: plugins/admin/systems/class_workstationStartup.inc:400
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:461
+#: plugins/admin/systems/class_workstationStartup.inc:445
 #, fuzzy
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:519
+#: plugins/admin/systems/class_workstationStartup.inc:503
 #, fuzzy
 msgid ""
 "There is already a profile in your selection that contain partition table "
@@ -10280,14 +10302,14 @@ msgid ""
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_workstationStartup.inc:852
+#: plugins/admin/systems/class_workstationStartup.inc:836
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:847
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -10296,18 +10318,18 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1030
+#: plugins/admin/systems/class_workstationStartup.inc:1014
 #, fuzzy
 msgid "Saving workstation startup settings failed"
 msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
+#: plugins/admin/systems/class_workstationStartup.inc:1064
 #, fuzzy, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_workstationStartup.inc:1066
 #: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
@@ -10833,7 +10855,7 @@ msgstr "Обязательное поле 'Название рабочей ст
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_terminalGeneric.inc:386
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:625
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
@@ -10944,7 +10966,7 @@ msgid "New Terminal template"
 msgstr "Шаблон терминала"
 
 #: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_systemManagement.inc:760
 #, fuzzy
 msgid "New Terminal"
 msgstr "Создать терминал"
@@ -10955,7 +10977,7 @@ msgid "New Workstation template"
 msgstr "Шаблон рабочей станции"
 
 #: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_systemManagement.inc:761
 #, fuzzy
 msgid "New Workstation"
 msgstr "Новая рабочая станция"
@@ -11071,37 +11093,37 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 #, fuzzy
 msgid "Please specify a valid name for your share."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
 msgid "Please specify a name for your share."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 #, fuzzy
 msgid "Volume contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
@@ -12422,82 +12444,82 @@ msgstr "У вас недостаточно прав для смены парол
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "New terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:631
 #, fuzzy
 msgid "New Device"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:646
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Workstation template for"
 msgstr "Шаблон рабочей станции для"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_systemManagement.inc:746
 #, fuzzy
 msgid "New System from incoming"
 msgstr "Системная информация"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:748
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
 
-#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_systemManagement.inc:749
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:750
 #, fuzzy
 msgid "Workstation is installing"
 msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_systemManagement.inc:751
 #, fuzzy
 msgid "Workstation is waiting for action"
 msgstr "Шаблон рабочей станции для"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:752
 #, fuzzy
 msgid "Workstation installation failed"
 msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
+#: plugins/admin/systems/class_systemManagement.inc:755
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "Server is waiting for action"
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:757
 #, fuzzy
 msgid "Server installation failed"
 msgstr "Номер дома"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
+#: plugins/admin/systems/class_systemManagement.inc:758
 #, fuzzy
 msgid "Winstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_systemManagement.inc:759
 #, fuzzy
 msgid "Network Device"
 msgstr "Сетевые устройства"
@@ -12754,39 +12776,39 @@ msgstr "Укажите корректный номер телефона."
 msgid "Please specify a numeric value for retry."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:243
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:314
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:288
 msgid "This 'dn' has no printer features."
 msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:296
 #, fuzzy
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
@@ -12796,13 +12818,13 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:306
 #, fuzzy
 msgid "Remove printer extension"
 msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:304
 #, fuzzy
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
@@ -12811,7 +12833,7 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:307
 #, fuzzy
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
@@ -12820,7 +12842,7 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:312
 #, fuzzy
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
@@ -12829,7 +12851,7 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:315
 #, fuzzy
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
@@ -12838,36 +12860,51 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:481
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:489
 #, fuzzy
 msgid "can't get ppd informations."
 msgstr "Системная информация"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:502
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:504
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:559
 #, fuzzy
 msgid "Removing printer failed"
 msgstr "Показать подразделения"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:756
 #, fuzzy
 msgid "Saving printer failed"
 msgstr "Показать подразделения"
 
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:823
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:831
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
@@ -13260,6 +13297,243 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Настройки телефона"
 
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "Отправитель"
+
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Роль"
+
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:387
+msgid "Spamassassin"
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
+msgid ""
+"This server has spamassassin features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
+msgid ""
+"This server has spamassassin features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_goSpamServer.inc:270
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/admin/systems/class_goSpamServer.inc:318
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/admin/systems/class_goSpamServer.inc:327
+msgid "Required score must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goSpamServer.inc:447
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+
+#: plugins/admin/systems/class_goSpamServer.inc:471
+#, php-format
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
+msgid ""
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "Размер квоты"
+
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Изменить параметры"
+
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Выбрать номера для добавления"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
+msgstr ""
+
 #: plugins/admin/ogroups/class_termgroup.inc:111
 msgid "There must be at least one NTP server selected."
 msgstr ""
@@ -14801,10 +15075,6 @@ msgstr "Добро пожаловать %s!"
 #~ msgid "Remove inventory service"
 #~ msgstr "Удалить сервис DNS"
 
-#, fuzzy
-#~ msgid "Add inventory service"
-#~ msgstr "Добавить сервис DNS"
-
 #, fuzzy
 #~ msgid "Monitor"
 #~ msgstr "Мониторинг"