Tweaked xml list

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

diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.xml b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.xml
index 53597854bebcc8291377f45379113d8633b9a866..c7fac860edfcbe9cb7f8a471c4c52678aad4ab23 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.xml
+++ b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.xml
@@ -8,7 +8,7 @@
     <multiSelect>true</multiSelect>
     <template>../../addons/goto/events/eventTargetSystems-list.tpl</template>
     <module>server</module>
-    <label>List of systems</label>
+    <label>List of target systems</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>

diff --git a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
index b4c2d831d93da6360c5dab980f1e8c74d0c89bad..19b5c1facfd5e192148eb727433c4cf694b92c8b 100644 (file)
--- a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2009-07-22 13:16+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -44,75 +44,75 @@ msgstr ""
 "Systemen ererbt werden."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Allgemein"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Zeit-Server"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 "Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Wählen Sie den Terminal-Modus"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Syslog-Server"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Root-Server"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 "Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
@@ -122,40 +122,40 @@ msgstr ""
 msgid "Inherit all values to group members"
 msgstr "Alle Werte auf Mitglieder übertragen"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Aktion"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Ausführen"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "Aktiv"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "Gesperrt"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 msgid "Local swap"
 msgstr "Lokaler Auslagerungsspeicher"
 
@@ -173,7 +173,7 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -191,51 +191,53 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "geerbt"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 msgid "Event error"
 msgstr "Ereignis-Fehler"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfügbar!"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Ausschalten"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -254,15 +256,16 @@ msgid "Wake"
 msgstr "Aufwecken"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Neu-Installation"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -285,15 +288,15 @@ msgstr "Systemanalyse"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -302,18 +305,18 @@ msgstr "Systemanalyse"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 msgid "LDAP error"
@@ -328,13 +331,13 @@ msgid "System group"
 msgstr "System-Gruppe"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 msgid "Ntp server"
 msgstr "NTP-Dienst"
 
@@ -370,42 +373,42 @@ msgid "Reset"
 msgstr "Zurücksetzen"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -460,8 +463,8 @@ msgstr "Anwendungen der Gruppe"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Anwendung"
 
@@ -495,12 +498,12 @@ msgid "Folder"
 msgstr "Verzeichnis"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -514,9 +517,8 @@ msgstr "Nach unten bewegen"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -524,7 +526,7 @@ msgstr "Entfernen"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -570,33 +572,33 @@ msgid "List of devices"
 msgstr "Liste der Geräte"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "Gerät"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -609,7 +611,7 @@ msgstr "Beschreibung"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -617,7 +619,7 @@ msgstr "Aktionen"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Anlegen"
 
@@ -630,65 +632,66 @@ msgid "Remove device"
 msgstr "Gerät entfernen"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Geräte"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "Gerätename"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 msgid "Device type"
 msgstr "Gerätetyp"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 msgid "Choose the device type"
 msgstr "Wählen Sie den Gerätetyp"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "(iSerial)"
 msgstr "(iSerial)"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr "Anbieter-ID"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr "(idVendor)"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr "Produkt-ID"
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr "(idProduct)"
 
@@ -704,30 +707,31 @@ msgstr "(idProduct)"
 msgid "Filter"
 msgstr "Filter"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr "Digitalkamera"
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 msgid "USB stick"
 msgstr "USB-Stick"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr "CD/DVD-Laufwerk"
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 msgid "iSerial"
 msgstr "iSerial"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -737,21 +741,24 @@ msgstr "iSerial"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -761,15 +768,15 @@ msgstr "iSerial"
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Device generic"
 msgstr "Allgemeines zum Gerät"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Hotplug"
 msgstr "Hotplug"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -781,16 +788,16 @@ msgstr "Hotplug"
 msgid "Type"
 msgstr "Typ"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Seriell"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 msgid "Vendor"
 msgstr "Hersteller"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 msgid "Device ID"
 msgstr "Geräte-ID"
 
@@ -852,7 +859,7 @@ msgid "Application parameter settings"
 msgstr "Konfiguration der Anwendungs-Parameter"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -861,7 +868,7 @@ msgid "Display name"
 msgstr "Angezeigter Name"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
@@ -874,15 +881,13 @@ msgid "Choose subtree to place application in"
 msgstr "Wählen Sie den Teilbaum, in den die Anwendung plaziert werden soll."
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Symbol"
 
@@ -910,27 +915,27 @@ msgid "Options"
 msgstr "Optionen"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Nur ausführbar für Gruppen-Mitglieder"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 
@@ -940,8 +945,7 @@ msgid "Script"
 msgstr "Skript"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -975,44 +979,44 @@ msgstr "Anwendung entfernen"
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 "Die Anwendung konnte nicht entfernt werden, sie wird momentan noch von "
 "folgenden Objekten verwendet: %s"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 msgid "no read permission"
 msgstr "Keine Leseberechtigung"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr "Kann Bild nicht in der Größe verändern"
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 msgid "cannot convert image"
 msgstr "Kann Bild nicht konvertieren"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, php-format
 msgid "cannot save image to '%s'"
 msgstr "Kann Bild nicht unter '%s' speichern"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 msgid "Execute path"
 msgstr "Arbeitsverzeichnis"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 msgid "Application generic"
 msgstr "Anwendung (Allgemein)"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 msgid "Script content"
 msgstr "Skript-Inhalt"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 msgid "Mime types"
 msgstr "MIME-Typen"
 
@@ -1032,7 +1036,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Bitte geben Sie hier einen Namen für den MIME-Typ ein"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 msgid "Mime group"
 msgstr "MIME-Gruppe"
 
@@ -1057,7 +1061,7 @@ msgid "Left click"
 msgstr "Linksklick"
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 msgid "File patterns"
 msgstr "Datei-Muster"
 
@@ -1112,19 +1116,19 @@ msgstr "MIME-Typ bearbeiten"
 msgid "Remove mimetype"
 msgstr "MIME-Typ entfernen"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 msgid "File pattern"
 msgstr "Datei-Muster"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 msgid "Mime type generic"
 msgstr "MIME-Typ (Allgemein)"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 msgid "Left click action"
 msgstr "Linksklick-Aktion"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 msgid "Embedded applications"
 msgstr "Eingebettete Anwendungen"
 
@@ -1370,26 +1374,22 @@ msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Ort"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "Zeit-Server-Attribute übernehmen"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 msgid "Inherit all values from group"
 msgstr "Alle Werte von Gruppe übernehmen"
 
@@ -1518,12 +1518,12 @@ msgstr "Objektgruppe"
 msgid "none"
 msgstr "keine"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
@@ -1531,16 +1531,16 @@ msgstr ""
 "Kann keine gültige Abteilung für dieses Objekt ermitteln, setze Basis auf '%"
 "s'."
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
@@ -1548,25 +1548,25 @@ msgstr ""
 "Konnte den 'Druck'-Reiter nicht initialisieren, der Parameter 'parent' "
 "fehlte während der Erstellung."
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 "Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 msgid "printer"
 msgstr "Drucker"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
@@ -1575,70 +1575,70 @@ msgstr ""
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 msgid "Not defined"
 msgstr "Nicht definiert"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "Kann PPD-Information nicht lesen"
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr "Dieser Drucker gehört zu %s. Sie können ihn nicht umbenennen."
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 msgid "Object is no printer!"
 msgstr "Das Objekt ist kein Drucker!"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "Drucker URL"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Benutzer"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 msgid "Print generic"
 msgstr "Drucken (Alllgemein)"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1646,41 +1646,41 @@ msgstr "Drucken (Alllgemein)"
 msgid "Printer"
 msgstr "Drucker"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr "Benannte URL"
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 msgid "Printer PPD"
 msgstr "Drucker-PPD"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "printer user"
 msgstr "Druckerbenutzer"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "Ungültiger Mitgliedstyp '%s'!"
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, php-format
 msgid "'%s' is already used!"
 msgstr "'%s' wird bereits verwendet!"
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "'%s' existiert nicht!"
@@ -1790,7 +1790,7 @@ msgid "System informations"
 msgstr "System-Informationen"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1798,8 +1798,8 @@ msgstr "Arbeitsstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -2091,54 +2091,56 @@ msgstr "Audio-Dienst"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Softwareupdate"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Erzwinge lokalen Systemstart"
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Es fehlt eine gültige LDAP-Server-Zusweisung!"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 msgid "Software deployment"
 msgstr "Softwareverteilung"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Dieses System installiert momentan. Wenn Sie es speichern möchten, drücken "
 "Sie 'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 msgid "Workstation generic"
 msgstr "Arbeitsstation (Allgemein)"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 msgid "Root password"
 msgstr "Root-Passwort"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 msgid "Create FAI CD"
 msgstr "FAI CD erstellen"
 
@@ -2204,7 +2206,7 @@ msgstr "Telefon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Treiber"
 
@@ -2267,7 +2269,6 @@ msgstr "Wählen Sie die Methode der Anbindung an den Terminal-Server"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 msgid "Reload"
 msgstr "Neu laden"
 
@@ -2521,15 +2522,15 @@ msgstr "Zugewiesene FAI-Klassen"
 msgid "set"
 msgstr "setzen"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 msgid "Terminal generic"
 msgstr "Terminal (Allgemein)"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 msgid "Syslog server enabled"
 msgstr "Protokoll-Server aktiviert"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 msgid "Ntp server settings"
 msgstr "NTP-Dienst-Einstellungen"
 
@@ -2541,35 +2542,31 @@ msgstr "Allgemein"
 msgid "Printer name"
 msgstr "Druckername"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Details"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "Drucker-Standort"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr "PPD Anbieter"
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Benutzer"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "Administratoren"
 
@@ -2625,11 +2622,7 @@ msgstr "Terminal-Vorlage"
 msgid "Terminal name"
 msgstr "Terminal-Name"
 
-#: admin/systems/goto/terminal.tpl:31
-msgid "Choose subtree to place terminal in"
-msgstr "Wählen Sie den Teilbaum, in den das Terminal eingepflegt werden soll"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 msgid "Inherit all"
 msgstr "Alles übernehmen"
 
@@ -2911,7 +2904,7 @@ msgstr "Zeitstempel"
 msgid "MAC"
 msgstr "MAC"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 msgid "Event"
 msgstr "Ereignis"
@@ -2945,49 +2938,71 @@ msgstr "Log-Ansicht"
 msgid "GOto log view"
 msgstr "GOto Log-Ansicht"
 
-#: addons/goto/class_gotomasses.inc:26
-msgid "Deployment status"
-msgstr "Verteilungs-Status"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 msgid "System deployment status"
 msgstr "Systemverteilungs-Status"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr "sofort"
+
+#: addons/goto/class_gotomasses.inc:175
+msgid "Waiting"
+msgstr "Wartend"
+
+#: addons/goto/class_gotomasses.inc:181
+msgid "Processed"
+msgstr "Durchgeführt"
+
+#: addons/goto/class_gotomasses.inc:196
+msgid "Detection"
+msgstr "Erkennung"
+
+#: addons/goto/class_gotomasses.inc:204
+msgid "in progress"
+msgstr "in Bearbeitung"
+
+#: addons/goto/class_gotomasses.inc:228
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 "Die folgenden Aufträge konnten nicht gelöscht werden, sie müssen abgebrochen "
 "werden: %s"
 
-#: addons/goto/class_gotomasses.inc:360
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "Kann Warteschlangeneintrag nicht aktualisieren: %s"
+
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
-"Dieses Menü erlaubt es Ihnen, GOsa-Aufgaben zu entfernen oder die "
-"Eigenschaften zu verändern."
+"Die erforderliche Klasse '%s' wurde nicht gefunden: Auftrag abgebrochen!"
 
-#: addons/goto/class_gotomasses.inc:361
-msgid "List of queued jobs"
-msgstr "Liste der geplanten Vorgänge"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Kann Warteschlangeneinträge nicht aktualisieren."
 
-#: addons/goto/class_gotomasses.inc:380
-msgid "Resume"
-msgstr "Fortsetzen"
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
+msgid "System deployment"
+msgstr "System-Verteilung"
 
-#: addons/goto/class_gotomasses.inc:381
-msgid "Pause"
-msgstr "Pause"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren"
 
-#: addons/goto/class_gotomasses.inc:382
-msgid "Abort"
-msgstr "Abbrechen"
+#: addons/goto/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Liste der geplanten Vorgänge"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3009,16 +3024,15 @@ msgstr "Abbrechen"
 msgid "Target"
 msgstr "Ziel"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "Vorgang"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 msgid "Period"
 msgstr "Intervall"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3036,8 +3050,7 @@ msgstr "Intervall"
 msgid "Schedule"
 msgstr "Plan"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3056,76 +3069,52 @@ msgstr "Plan"
 msgid "Status"
 msgstr "Status"
 
-#: addons/goto/class_gotomasses.inc:443
-msgid "Pause job"
-msgstr "Vorgang pausieren"
-
-#: addons/goto/class_gotomasses.inc:450
-msgid "Resume job"
-msgstr "Vorgang fortsetzen"
-
-#: addons/goto/class_gotomasses.inc:457
-msgid "Execute now"
-msgstr "Sofort ausführen"
-
-#: addons/goto/class_gotomasses.inc:464
-msgid "View logs"
-msgstr "Protokolle einsehen"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
+msgstr "Sperre"
 
-#: addons/goto/class_gotomasses.inc:479
-msgid "Abort job"
-msgstr "Vorgang abbrechen"
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
+msgstr "Sperre aufheben"
 
-#: addons/goto/class_gotomasses.inc:525
-msgid "Waiting"
-msgstr "Wartend"
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
+msgid "Resume"
+msgstr "Fortsetzen"
 
-#: addons/goto/class_gotomasses.inc:531
-msgid "Processed"
-msgstr "Durchgeführt"
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
+msgid "Pause"
+msgstr "Pause"
 
-#: addons/goto/class_gotomasses.inc:546
-msgid "Detection"
-msgstr "Erkennung"
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
+msgid "Abort"
+msgstr "Abbrechen"
 
-#: addons/goto/class_gotomasses.inc:554
-msgid "in progress"
-msgstr "in Bearbeitung"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "Auf"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr "sofort"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "Ab"
 
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "Kann Warteschlangeneintrag nicht aktualisieren: %s"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Kann Warteschlangeneinträge nicht aktualisieren."
+#: addons/goto/deploy-list.xml:225
+#, fuzzy
+msgid "Process now"
+msgstr "Durchgeführt"
 
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
-"Die erforderliche Klasse '%s' wurde nicht gefunden: Auftrag abgebrochen!"
+#: addons/goto/deploy-list.xml:233
+msgid "View logs"
+msgstr "Protokolle einsehen"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "Kann Warteschlangeneinträge nicht laden: %s"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-msgid "System deployment"
-msgstr "System-Verteilung"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren"
-
 #: addons/goto/log_view.tpl:7
 msgid "Available logs"
 msgstr "Verfügbare Protokolle"
@@ -3138,11 +3127,6 @@ msgstr "Ausgewähltes Protokoll"
 msgid "No logs for this host available!"
 msgstr "Es sind keine Protokolle für dieses System verfügbar!"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr "Sperre"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3207,11 +3191,6 @@ msgstr "GOto Aktualisieren"
 msgid "Reload GOto settings"
 msgstr "GOto-Einstellungen aktualisieren"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr "Sperre aufheben"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 msgid "Abort installation"
@@ -3369,7 +3348,8 @@ msgid "Show users"
 msgstr "Zeige Benutzer"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
-msgid "List of systems"
+#, fuzzy
+msgid "List of target systems"
 msgstr "Liste der Systeme"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3703,6 +3683,38 @@ msgstr "Letztes Skript"
 msgid "Script can be replaced by user"
 msgstr "Skript kann vom Benutzer ausgetauscht werden"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr ""
+#~ "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
+
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr ""
+#~ "Wählen Sie den Teilbaum, in den das Terminal eingepflegt werden soll"
+
+#~ msgid "Deployment status"
+#~ msgstr "Verteilungs-Status"
+
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "Dieses Menü erlaubt es Ihnen, GOsa-Aufgaben zu entfernen oder die "
+#~ "Eigenschaften zu verändern."
+
+#~ msgid "Pause job"
+#~ msgstr "Vorgang pausieren"
+
+#~ msgid "Resume job"
+#~ msgstr "Vorgang fortsetzen"
+
+#~ msgid "Execute now"
+#~ msgstr "Sofort ausführen"
+
+#~ msgid "Abort job"
+#~ msgstr "Vorgang abbrechen"
+
 #~ msgid "Submit"
 #~ msgstr "Übertragen"
 

diff --git a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
index 37f0482e173d0ab24cf3ddc34c5bfeb5f0614535..c7310ddf61dc8064ea7840ce5915f2342a4b7acf 100644 (file)
--- a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2010-01-28 23:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
@@ -39,74 +39,74 @@ msgstr ""
 "heredados por los clientes asignados a este grupo de objetos."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Genérico"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Servidor NTP"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "Elija un servidor que será usado para sincronización horaria"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modo"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Seleccionar modo de terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Servidor de registro de sistema"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Elija un servidor que será usado para registro"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Servidor Raíz"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 "Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
@@ -116,40 +116,40 @@ msgstr ""
 msgid "Inherit all values to group members"
 msgstr "Que los miembros del grupo heredaran todos los valores"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Acción"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Ejecute"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "Activado"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
@@ -167,7 +167,7 @@ msgstr "Memoria de intercambio local"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -185,51 +185,53 @@ msgstr "Memoria de intercambio local"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Infraestructura de servicio"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 msgid "Event error"
 msgstr "Evento de error"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "¡El evento '%s' no está disponible!"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Apagar"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -248,15 +250,16 @@ msgid "Wake"
 msgstr "Despertar"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -279,15 +282,15 @@ msgstr "Análisis del sistema"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -296,18 +299,18 @@ msgstr "Análisis del sistema"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 msgid "LDAP error"
@@ -322,13 +325,13 @@ msgid "System group"
 msgstr "Grupos de sistemas"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 msgid "Action flag"
 msgstr "Marca de acción"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 msgid "Ntp server"
 msgstr "Servidor NTP"
 
@@ -364,42 +367,42 @@ msgid "Reset"
 msgstr "Borrar"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "Parametros de la aplicación"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -454,8 +457,8 @@ msgstr "Grupo de aplicaciones"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Aplicación"
 
@@ -489,12 +492,12 @@ msgid "Folder"
 msgstr "Carpeta"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "Mover arriba"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "Mover abajo"
 
@@ -508,9 +511,8 @@ msgstr "Mover abajo"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -518,7 +520,7 @@ msgstr "Eliminar"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Editar"
@@ -564,33 +566,33 @@ msgid "List of devices"
 msgstr "Lista de dispositivos"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -603,7 +605,7 @@ msgstr "Descripción"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Acciones"
 
@@ -611,7 +613,7 @@ msgstr "Acciones"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Crear"
 
@@ -624,65 +626,66 @@ msgid "Remove device"
 msgstr "Eliminar dispositivo"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "Nombre del dispositivo"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 msgid "Device type"
 msgstr "Nombre del dispositivo"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 msgid "Choose the device type"
 msgstr "Elija tipo de dispositivo"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "Número de serie"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "(iSerial)"
 msgstr "(¡Numero Serie)"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr "ID del Proveedor"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr "(idProveedor)"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr "ID del Producto"
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr "(idProducto)"
 
@@ -698,30 +701,31 @@ msgstr "(idProducto)"
 msgid "Filter"
 msgstr "Filtro"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr "Cámara digital"
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 msgid "USB stick"
 msgstr "Llavero USB"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr "Unidad CD/DVD"
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 msgid "iSerial"
 msgstr "¡Serie"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -731,21 +735,24 @@ msgstr "¡Serie"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -755,15 +762,15 @@ msgstr "¡Serie"
 msgid "Error"
 msgstr "Error"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Device generic"
 msgstr "Dispositivo genérico"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Hotplug"
 msgstr "Conexión en caliente (HotPlug)"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -775,16 +782,16 @@ msgstr "Conexión en caliente (HotPlug)"
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 msgid "Vendor"
 msgstr "Proveedor"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 msgid "Device ID"
 msgstr "ID del Dispositivo"
 
@@ -846,7 +853,7 @@ msgid "Application parameter settings"
 msgstr "Configuración de los parámetros de aplicación"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -855,7 +862,7 @@ msgid "Display name"
 msgstr "Nombre a Mostrar"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Nombre con el que se mostrara la aplicación(esto es debajo de los iconos)"
@@ -869,15 +876,13 @@ msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol donde colocar la aplicación"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "Seleccione una base"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Icono"
 
@@ -905,27 +910,27 @@ msgid "Options"
 msgstr "Opciones"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrada en los barra de inicio de los miembros"
 
@@ -935,8 +940,7 @@ msgid "Script"
 msgstr "Script"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -970,43 +974,43 @@ msgstr "Eliminar aplicación"
 msgid "no example"
 msgstr "sin ejemplo"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 "No se puede eliminar las aplicación, está todavía en uso por el objeto '%s'."
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 msgid "no read permission"
 msgstr "No tiene permiso de lectura"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr "No se puede redimensionar la imagen"
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 msgid "cannot convert image"
 msgstr "No se puede convertir la imagen"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, php-format
 msgid "cannot save image to '%s'"
 msgstr "No se puede guardar la imagen en '%s'"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 msgid "Execute path"
 msgstr "Ruta del ejecutable"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 msgid "Application generic"
 msgstr "Aplicación genérica"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 msgid "Script content"
 msgstr "Contenido del script"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 msgid "Mime types"
 msgstr "Tipos MIME"
 
@@ -1026,7 +1030,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Por favor introduzca un nombre para el tipo mime valido"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 msgid "Mime group"
 msgstr "Grupo Mime"
 
@@ -1051,7 +1055,7 @@ msgid "Left click"
 msgstr "Botón izquierdo"
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 msgid "File patterns"
 msgstr "Patrones de archivos"
 
@@ -1106,19 +1110,19 @@ msgstr "Editar tipo mime"
 msgid "Remove mimetype"
 msgstr "Eliminar tipo mime"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 msgid "File pattern"
 msgstr "Patrón de archivo"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 msgid "Mime type generic"
 msgstr "Tipo MIME genérico"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 msgid "Left click action"
 msgstr "Acción del botón izquierdo"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 msgid "Embedded applications"
 msgstr "Aplicaciones embebidas"
 
@@ -1363,26 +1367,22 @@ msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Nombre de la estación de trabajo"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Localización"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Elija el subárbol donde colocar el grupo"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "heredar características del servidor horario"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 msgid "Inherit all values from group"
 msgstr "heredar todos los valores del grupo"
 
@@ -1511,12 +1511,12 @@ msgstr "Grupo de objetos"
 msgid "none"
 msgstr "ninguno"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 msgid "Internal error"
 msgstr "Error interno"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
@@ -1524,16 +1524,16 @@ msgstr ""
 "No puedo determinar un departamento válido para este objeto, ¡le sera puesta "
 "la base a '%s'!"
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "Añadir extensión de impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
@@ -1541,27 +1541,27 @@ msgstr ""
 "No se puede activar la pestaña de impresora, el origen de los parametros "
 "desapareció cuando se estaba construyendo."
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 "Esto es una plantilla de estación de trabajo, la pestaña de impresión está "
 "desactivada."
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 "Esto es una plantilla de termina, la pestaña de impresión está desactivada."
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 msgid "printer"
 msgstr "impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
@@ -1570,70 +1570,70 @@ msgstr ""
 "Posiblemente esto ocurra porque actualmente está creando una nueva plantilla "
 "de terminal."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "Eliminar extensión de impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "El archivo PPD seleccionado '%s' no existe."
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 msgid "Not defined"
 msgstr "No definido"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "No se puede acceder a la información PPD"
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr "Esta impresora pertenece a %s. No puede renombrar esta impresora."
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "estación de trabajo"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 msgid "Object is no printer!"
 msgstr "¡El objeto no es una impresora!"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "URL de la impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Usuario"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 msgid "Print generic"
 msgstr "Impresora genérica"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1641,41 +1641,41 @@ msgstr "Impresora genérica"
 msgid "Printer"
 msgstr "Impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr "LabeledURL"
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 msgid "Printer PPD"
 msgstr "Impresora PPD"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "printer user"
 msgstr "usuario de impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "¡tipo de miembro ilegal '%s'!"
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, php-format
 msgid "'%s' is already used!"
 msgstr "¡'%s' ya esta siendo usado!"
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "¡'%s' no existe!"
@@ -1784,7 +1784,7 @@ msgid "System informations"
 msgstr "Información de sistemas"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1792,8 +1792,8 @@ msgstr "Estación de trabajo"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -2085,53 +2085,55 @@ msgstr "Servicio de audio"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Actualización software"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forzar inicio local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Despertar"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr "¡Falta una asignación válida de servidor LDAP!"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 msgid "Software deployment"
 msgstr "Despliegue de software"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Esta maquina está actualmente instalándose, si quiere grabarla, pulse 'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 msgid "Workstation generic"
 msgstr "Estación de trabajo genérica"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 msgid "Goto mode"
 msgstr "Pasar al modo"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 msgid "Root password"
 msgstr "Contraseña de root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 msgid "Create FAI CD"
 msgstr "Crear CD FAI"
 
@@ -2197,7 +2199,7 @@ msgstr "Teléfono"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Controlador"
 
@@ -2260,7 +2262,6 @@ msgstr "Elija el método de conexión con el servidor de terminal"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 msgid "Reload"
 msgstr "Recargar"
 
@@ -2327,7 +2328,8 @@ msgstr ""
 "El repositorio FAI '%s' no es accesible, ¡Configurando el repositorio espejo "
 "a 'auto'!"
 
-#: admin/systems/goto/class_workstationStartup.inc:247, php-format
+#: admin/systems/goto/class_workstationStartup.inc:247
+#, php-format
 msgid ""
 "FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
 msgstr ""
@@ -2511,15 +2513,15 @@ msgstr "Asignar clases FAI"
 msgid "set"
 msgstr "activar"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 msgid "Terminal generic"
 msgstr "Terminal genérico"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 msgid "Syslog server enabled"
 msgstr "Servidor de registro de sistema activado"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 msgid "Ntp server settings"
 msgstr "Parámetros del servidor NTP"
 
@@ -2531,35 +2533,31 @@ msgstr "General"
 msgid "Printer name"
 msgstr "Nombre de la impresora"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Elija el subárbol donde colocar al usuario"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Detalles"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "Localización de la impresora"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr "Proveedor PPD"
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "Administradores"
 
@@ -2616,11 +2614,7 @@ msgstr "Plantilla de terminal"
 msgid "Terminal name"
 msgstr "Nombre del terminal"
 
-#: admin/systems/goto/terminal.tpl:31
-msgid "Choose subtree to place terminal in"
-msgstr "Elija un subárbol donde colocar el terminal"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 msgid "Inherit all"
 msgstr "heredar todo"
 
@@ -2898,7 +2892,7 @@ msgstr "Marca de tiempo"
 msgid "MAC"
 msgstr "MAC"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 msgid "Event"
 msgstr "Evento"
@@ -2932,48 +2926,70 @@ msgstr "Vista del registro"
 msgid "GOto log view"
 msgstr "Vista del registro GOto"
 
-#: addons/goto/class_gotomasses.inc:26
-msgid "Deployment status"
-msgstr "Estado del despliegue"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 msgid "System deployment status"
 msgstr "Estado del despliegue de sistemas"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr "inmediatamente"
+
+#: addons/goto/class_gotomasses.inc:175
+msgid "Waiting"
+msgstr "Esperando"
+
+#: addons/goto/class_gotomasses.inc:181
+msgid "Processed"
+msgstr "Procesado"
+
+#: addons/goto/class_gotomasses.inc:196
+msgid "Detection"
+msgstr "Detección"
+
+#: addons/goto/class_gotomasses.inc:204
+msgid "in progress"
+msgstr "en progreso"
+
+#: addons/goto/class_gotomasses.inc:228
 msgid "Permission"
 msgstr "Permisos"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
 
-#: addons/goto/class_gotomasses.inc:360
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "No se puede actualizar la entrada de la cola: %s"
+
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
-"Este menú le permite añadir, eliminar o configurar las propiedades de tareas "
-"GOsa."
+"No se ha encontrado la clase necesaria '%s': ¡no se ha cancelado el trabajo!"
 
-#: addons/goto/class_gotomasses.inc:361
-msgid "List of queued jobs"
-msgstr "Lista de trabajos en cola"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "No se puede actualizar las entradas de la cola."
 
-#: addons/goto/class_gotomasses.inc:380
-msgid "Resume"
-msgstr "Continuar"
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
+msgid "System deployment"
+msgstr "Despliegue del sistema"
 
-#: addons/goto/class_gotomasses.inc:381
-msgid "Pause"
-msgstr "Pausar"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr "Provee un mecanismo para activar sistemas automáticamente"
 
-#: addons/goto/class_gotomasses.inc:382
-msgid "Abort"
-msgstr "Cancelar"
+#: addons/goto/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Lista de trabajos en cola"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -2995,16 +3011,15 @@ msgstr "Cancelar"
 msgid "Target"
 msgstr "Objetivo"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "Tarea"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 msgid "Period"
 msgstr "Periodo"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3022,8 +3037,7 @@ msgstr "Periodo"
 msgid "Schedule"
 msgstr "Programación"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3042,76 +3056,52 @@ msgstr "Programación"
 msgid "Status"
 msgstr "Estado"
 
-#: addons/goto/class_gotomasses.inc:443
-msgid "Pause job"
-msgstr "Pausar trabajo"
-
-#: addons/goto/class_gotomasses.inc:450
-msgid "Resume job"
-msgstr "Continuar trabajo"
-
-#: addons/goto/class_gotomasses.inc:457
-msgid "Execute now"
-msgstr "Ejecutar ahora"
-
-#: addons/goto/class_gotomasses.inc:464
-msgid "View logs"
-msgstr "Ver registros"
-
-#: addons/goto/class_gotomasses.inc:479
-msgid "Abort job"
-msgstr "Cancelar trabajo"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
+msgstr "Bloqueo"
 
-#: addons/goto/class_gotomasses.inc:525
-msgid "Waiting"
-msgstr "Esperando"
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
+msgstr "Desbloquear"
 
-#: addons/goto/class_gotomasses.inc:531
-msgid "Processed"
-msgstr "Procesado"
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
+msgid "Resume"
+msgstr "Continuar"
 
-#: addons/goto/class_gotomasses.inc:546
-msgid "Detection"
-msgstr "Detección"
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
+msgid "Pause"
+msgstr "Pausar"
 
-#: addons/goto/class_gotomasses.inc:554
-msgid "in progress"
-msgstr "en progreso"
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
+msgid "Abort"
+msgstr "Cancelar"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr "inmediatamente"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "Arriba"
 
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "No se puede actualizar la entrada de la cola: %s"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "Abajo"
 
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "No se puede actualizar las entradas de la cola."
+#: addons/goto/deploy-list.xml:225
+#, fuzzy
+msgid "Process now"
+msgstr "Procesado"
 
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
-"No se ha encontrado la clase necesaria '%s': ¡no se ha cancelado el trabajo!"
+#: addons/goto/deploy-list.xml:233
+msgid "View logs"
+msgstr "Ver registros"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "No se puede cargar entradas en la cola: %s"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-msgid "System deployment"
-msgstr "Despliegue del sistema"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Provee un mecanismo para activar sistemas automáticamente"
-
 #: addons/goto/log_view.tpl:7
 msgid "Available logs"
 msgstr "Registros disponibles"
@@ -3124,11 +3114,6 @@ msgstr "Seleccionar registro"
 msgid "No logs for this host available!"
 msgstr "¡No hay registros para este equipo disponibles!"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr "Bloqueo"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3193,11 +3178,6 @@ msgstr "Recargar GOto"
 msgid "Reload GOto settings"
 msgstr "Recargar configuración GOto"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr "Desbloquear"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 msgid "Abort installation"
@@ -3355,7 +3335,8 @@ msgid "Show users"
 msgstr "Mostrar usuarios"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
-msgid "List of systems"
+#, fuzzy
+msgid "List of target systems"
 msgstr "Lista de sistemas"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3689,6 +3670,36 @@ msgstr "Último script"
 msgid "Script can be replaced by user"
 msgstr "EL script puede ser reemplazado por el usuario"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Elija el subárbol donde colocar el grupo"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Elija el subárbol donde colocar al usuario"
+
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Elija un subárbol donde colocar el terminal"
+
+#~ msgid "Deployment status"
+#~ msgstr "Estado del despliegue"
+
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "Este menú le permite añadir, eliminar o configurar las propiedades de "
+#~ "tareas GOsa."
+
+#~ msgid "Pause job"
+#~ msgstr "Pausar trabajo"
+
+#~ msgid "Resume job"
+#~ msgstr "Continuar trabajo"
+
+#~ msgid "Execute now"
+#~ msgstr "Ejecutar ahora"
+
+#~ msgid "Abort job"
+#~ msgstr "Cancelar trabajo"
+
 #~ msgid "Submit"
 #~ msgstr "Enviar"
 
@@ -5050,9 +5061,6 @@ msgstr "EL script puede ser reemplazado por el usuario"
 #~ msgid "Go up one department"
 #~ msgstr "Subir un departamento"
 
-#~ msgid "Up"
-#~ msgstr "Arriba"
-
 #~ msgid "Go to users department"
 #~ msgstr "Ir al departamento de usuarios"
 
@@ -5103,9 +5111,6 @@ msgstr "EL script puede ser reemplazado por el usuario"
 #~ msgid "Groups"
 #~ msgstr "Grupos"
 
-#~ msgid "Down"
-#~ msgstr "Abajo"
-
 #, fuzzy
 #~ msgid "No ACL settings for this category!"
 #~ msgstr "No hay ACL configuradas en esta categoría"

diff --git a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
index 0a3c3d793281123364c873fc2d9729a84edb29d8..d592924dc6c7f3115ddbe27e6ac03268ea1f55ca 100644 (file)
--- a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2010-01-30 11:38+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -35,74 +35,74 @@ msgstr ""
 "par les clients assigné à ce groupe d'objets."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Informations"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Serveur NTP"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "Sélectionnez le serveur pour la synchronisation du temps"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Mode"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Sélectionnez le mode du terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Serveur de journaux systèmes"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Sélectionnez le serveur de journaux à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Serveur Primaire"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Sélectionnez le système de fichier racine NFS à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Serveur de Swap"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
 
@@ -110,40 +110,40 @@ msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
 msgid "Inherit all values to group members"
 msgstr "Les membres du groupe héritent de toute les valeurs"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Action"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Sélectionnez l'opération à exécuter sur le terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Exécuter"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "Activé"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "Verrouillé"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 msgid "Local swap"
 msgstr "swap locale"
 
@@ -161,7 +161,7 @@ msgstr "swap locale"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -179,51 +179,53 @@ msgstr "swap locale"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "hérité"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Infrastructure des services"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 msgid "Event error"
 msgstr "Erreur Evénement "
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "L'événement '%s' n'est pas disponible !"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Eteindre"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -242,15 +244,16 @@ msgid "Wake"
 msgstr "Réveiller"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Reinstaller"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -273,15 +276,15 @@ msgstr "Analyse du système"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -290,18 +293,18 @@ msgstr "Analyse du système"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 msgid "LDAP error"
@@ -316,13 +319,13 @@ msgid "System group"
 msgstr "Groupe système"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 msgid "Ntp server"
 msgstr "Serveur NTP"
 
@@ -358,42 +361,42 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "Préférences de l'application"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -448,8 +451,8 @@ msgstr "Groupe d'applications"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Applications"
 
@@ -483,12 +486,12 @@ msgid "Folder"
 msgstr "Dossier"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "En haut"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "En bas"
 
@@ -502,9 +505,8 @@ msgstr "En bas"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -512,7 +514,7 @@ msgstr "Supprimer"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Editer"
@@ -559,33 +561,33 @@ msgid "List of devices"
 msgstr "Liste des périphériques"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "Périphérique"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -598,7 +600,7 @@ msgstr "Description"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Actions"
 
@@ -606,7 +608,7 @@ msgstr "Actions"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Créer"
 
@@ -619,65 +621,66 @@ msgid "Remove device"
 msgstr "Suppression d'un périphérique"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Périphériques"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "Nom du périphérique"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 msgid "Device type"
 msgstr "Type de périphérique"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 msgid "Choose the device type"
 msgstr "Choisissez le type de périphérique"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "Numéro de série"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "(iSerial)"
 msgstr "(ISérie)"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr "ID du vendeur"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr "(Idvendeur)"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr "ID du produit"
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr "(Idproduit)"
 
@@ -693,30 +696,31 @@ msgstr "(Idproduit)"
 msgid "Filter"
 msgstr "Filtre"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr "Appareil photo numérique"
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 msgid "USB stick"
 msgstr "Clé USB"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr "Lecteur de CD / DVD"
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 msgid "iSerial"
 msgstr "ISérie"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -726,21 +730,24 @@ msgstr "ISérie"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -750,15 +757,15 @@ msgstr "ISérie"
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Device generic"
 msgstr "Information du périphérique"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Hotplug"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -770,16 +777,16 @@ msgstr ""
 msgid "Type"
 msgstr "Type"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Série"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 msgid "Vendor"
 msgstr "Vendeur"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 msgid "Device ID"
 msgstr "ID du périphérique"
 
@@ -841,7 +848,7 @@ msgid "Application parameter settings"
 msgstr "Préférences de l'application"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Nom de l'application"
 
@@ -850,7 +857,7 @@ msgid "Display name"
 msgstr "Nom à afficher"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Le nom de l'application à afficher (ex: en dessous des icônes)"
 
@@ -865,15 +872,13 @@ msgstr ""
 "l'application"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "Sélectionnez une base"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Icône"
 
@@ -901,27 +906,27 @@ msgid "Options"
 msgstr "Options"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Exécutable uniquement par les membres"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Remplacer la configuration de l'utilisateur au démarrage"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Placer une icône sur le bureau des membres"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
@@ -931,8 +936,7 @@ msgid "Script"
 msgstr "Script"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -966,44 +970,44 @@ msgstr "Supprimer une application"
 msgid "no example"
 msgstr "pas d'exemple"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 "Impossible d'enlever l'application ,elle est encore utilisée par ce(s) "
 "objets : %s"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 msgid "no read permission"
 msgstr "Pas de permissions en lecture"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr "Impossible de redimensionner l'image"
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 msgid "cannot convert image"
 msgstr "impossible de convertir l'image"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, php-format
 msgid "cannot save image to '%s'"
 msgstr "Impossible de sauver l'image dans '%s'"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 msgid "Execute path"
 msgstr "Chemin d'exécution"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 msgid "Application generic"
 msgstr "Information des applications"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 msgid "Script content"
 msgstr "Contenu du script"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 msgid "Mime types"
 msgstr "Types mime"
 
@@ -1023,7 +1027,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Veuillez entrer un nom pour le type mime"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 msgid "Mime group"
 msgstr "Groupe de type mime"
 
@@ -1048,7 +1052,7 @@ msgid "Left click"
 msgstr "Clic gauche"
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 msgid "File patterns"
 msgstr "Filtres des fichiers"
 
@@ -1103,19 +1107,19 @@ msgstr "Editer un type mime"
 msgid "Remove mimetype"
 msgstr "Suppression d'un type mime"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 msgid "File pattern"
 msgstr "Filtres des fichiers"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 msgid "Mime type generic"
 msgstr "Information sur les types mime"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 msgid "Left click action"
 msgstr "Clic gauche"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 msgid "Embedded applications"
 msgstr "Applications Incorporées"
 
@@ -1361,26 +1365,22 @@ msgid "Workstation template"
 msgstr "Modèle de station de travail"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Lieu"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Sélectionnez la branche où sera placée le groupe"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "Hérite des paramètres du serveur de temps"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 msgid "Inherit all values from group"
 msgstr "Hériter toutes les valeurs du groupe"
 
@@ -1509,28 +1509,29 @@ msgstr "Groupes d'objets"
 msgid "none"
 msgstr "aucun"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
-msgid "Cannot determine a valid department for this object. Setting base to '%s'!"
+msgid ""
+"Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 "Impossible d'obtenir un département valide pour cet objet. Je met la base à "
 "'%s' ! "
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "Ajouter une extension d'imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
@@ -1538,24 +1539,25 @@ msgstr ""
 "Impossible d'initialiser l'onglet imprimante, le paramètre parent était "
 "manquant pendant la construction."
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
-msgstr "Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
+msgstr ""
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 msgid "printer"
 msgstr "imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
@@ -1563,70 +1565,70 @@ msgstr ""
 "Vous ne pourrez l'activer 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."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "Enlever l'extension d'impression"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 msgid "Not defined"
 msgstr "Non défini"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "Impossible d'obtenir des informations sur les ppd."
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr "Cette imprimante appartient à %s. Vous ne pouvez pas changer son nom."
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 msgid "terminal"
 msgstr "terminal"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "stations de travail"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 msgid "Object is no printer!"
 msgstr "L'objet n'est pas une Imprimante !"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "URL de l'imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Groupes"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Utilisateur"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 msgid "Print generic"
 msgstr "Imprimante générique"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1634,41 +1636,41 @@ msgstr "Imprimante générique"
 msgid "Printer"
 msgstr "Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr "URL de l'imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 msgid "Printer PPD"
 msgstr "PPD de  l'Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Permissions"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "printer user"
 msgstr "utilisateur de l'Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "Type de membre illégal '%s' !"
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, php-format
 msgid "'%s' is already used!"
 msgstr "'%s' est déjà utilisé !"
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "'%s' n'existe pas !"
@@ -1776,7 +1778,7 @@ msgid "System informations"
 msgstr "Information système"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1784,8 +1786,8 @@ msgstr "Stations de travail"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -2077,54 +2079,56 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Mise à jour logicielle"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forcer un démarrage local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Un serveur LDAP valide est manquant !"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 msgid "Software deployment"
 msgstr "Déploiement logiciel"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Cet hôte est en cours d'installation, si vous voulez le sauver, cliquez sur "
 "'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 msgid "Workstation generic"
 msgstr "Information de la station de travail"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 msgid "Goto mode"
 msgstr "Mode Goto"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 msgid "Root password"
 msgstr "Mot de passe root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 msgid "Create FAI CD"
 msgstr "Créer un CD FAI"
 
@@ -2190,7 +2194,7 @@ msgstr "Téléphone"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Pilote"
 
@@ -2254,7 +2258,6 @@ msgstr "Sélectionnez la méthode de connexion au terminal"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 msgid "Reload"
 msgstr "Recharger"
 
@@ -2317,11 +2320,13 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:234
 #, php-format
 msgid "FAI mirror '%s' is not available - setting to mirror 'auto'!"
-msgstr "Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
+msgstr ""
+"Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
 
 #: admin/systems/goto/class_workstationStartup.inc:247
 #, php-format
-msgid "FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
+msgid ""
+"FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
 msgstr ""
 "La version FAI '%s' n'est pas disponible sur le miroir '%s' - la version "
 "sera '%s' !"
@@ -2468,7 +2473,8 @@ msgstr "Continuer"
 msgid ""
 "FAI Object assignment disabled. You can't use this feature until FAI is "
 "activated."
-msgstr "Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
 
 #: admin/systems/goto/workstationStartup.tpl:66
 msgid "GOsa support daemon not configured"
@@ -2500,15 +2506,15 @@ msgstr "Liste des classes FAI utilisées"
 msgid "set"
 msgstr "activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 msgid "Terminal generic"
 msgstr "Information du terminal"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 msgid "Syslog server enabled"
 msgstr "Serveur de journaux systèmes activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 msgid "Ntp server settings"
 msgstr "Préférences du serveur de temps"
 
@@ -2520,35 +2526,31 @@ msgstr "Général"
 msgid "Printer name"
 msgstr "Nom de l'imprimante"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Détails"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "Localisation de l'imprimante"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr "Fournisseur de PPD"
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "Administrateurs"
 
@@ -2605,11 +2607,7 @@ msgstr "Modèle de terminaux"
 msgid "Terminal name"
 msgstr "Nom du terminal"
 
-#: admin/systems/goto/terminal.tpl:31
-msgid "Choose subtree to place terminal in"
-msgstr "Sélectionnez la branche où sera enregistrée le terminal"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 msgid "Inherit all"
 msgstr "Hériter de tout"
 
@@ -2728,7 +2726,8 @@ msgstr "Impossible de lire le PPD '%s' !"
 #: admin/systems/ppd/class_printerPPDDialog.inc:121
 #, php-format
 msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
+msgstr ""
+"Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:140
 #: admin/systems/ppd/class_printerPPDDialog.inc:339
@@ -2749,7 +2748,8 @@ msgstr "Ecrasement du PPD existant"
 msgid ""
 "There is already a ppd file for this kind of printer. Do you want to "
 "overwrite it?"
-msgstr "Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
+msgstr ""
+"Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:463
 msgid "Section"
@@ -2884,7 +2884,7 @@ msgstr "Date"
 msgid "MAC"
 msgstr "MAC"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 msgid "Event"
 msgstr "Evenement"
@@ -2918,45 +2918,70 @@ msgstr "Vue des journaux"
 msgid "GOto log view"
 msgstr "Vue des journaux GOto"
 
-#: addons/goto/class_gotomasses.inc:26
-msgid "Deployment status"
-msgstr "Etat du déploiement"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 msgid "System deployment status"
 msgstr "Etat du déploiement des systèmes"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr "Immédiatement"
+
+#: addons/goto/class_gotomasses.inc:175
+msgid "Waiting"
+msgstr "Avertissement"
+
+#: addons/goto/class_gotomasses.inc:181
+msgid "Processed"
+msgstr "Terminé"
+
+#: addons/goto/class_gotomasses.inc:196
+msgid "Detection"
+msgstr "Détection"
+
+#: addons/goto/class_gotomasses.inc:204
+msgid "in progress"
+msgstr "en cours"
+
+#: addons/goto/class_gotomasses.inc:228
 msgid "Permission"
 msgstr "Permissions"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
+msgstr ""
+"Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
 
-#: addons/goto/class_gotomasses.inc:360
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
-msgstr "Ce menu vous permet d'effacer et d'éditer les propriétés des tâches GOsa."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "Impossible de mettre à jour les files d'attente: %s"
 
-#: addons/goto/class_gotomasses.inc:361
-msgid "List of queued jobs"
-msgstr "Liste des tâches dans la queue"
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
+msgstr "La classe obligatoire '%s' n'a pas été trouvée: job non annulé !"
 
-#: addons/goto/class_gotomasses.inc:380
-msgid "Resume"
-msgstr "Redémarrer"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr "Impossible de mettre à jour les files d'attentes."
 
-#: addons/goto/class_gotomasses.inc:381
-msgid "Pause"
-msgstr "Suspendre"
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
+msgid "System deployment"
+msgstr "Déploiement de système"
 
-#: addons/goto/class_gotomasses.inc:382
-msgid "Abort"
-msgstr "Annuler"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
+"Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr "Liste des tâches dans la queue"
+
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -2978,16 +3003,15 @@ msgstr "Annuler"
 msgid "Target"
 msgstr "Cible"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "Tâches"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 msgid "Period"
 msgstr "Période"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3005,8 +3029,7 @@ msgstr "Période"
 msgid "Schedule"
 msgstr "Planificateur"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3025,75 +3048,52 @@ msgstr "Planificateur"
 msgid "Status"
 msgstr "Statut"
 
-#: addons/goto/class_gotomasses.inc:443
-msgid "Pause job"
-msgstr "Suspendre le job"
-
-#: addons/goto/class_gotomasses.inc:450
-msgid "Resume job"
-msgstr "Redémarrer le job"
-
-#: addons/goto/class_gotomasses.inc:457
-msgid "Execute now"
-msgstr "Exécuter maintenant"
-
-#: addons/goto/class_gotomasses.inc:464
-msgid "View logs"
-msgstr "Voir les journaux systèmes"
-
-#: addons/goto/class_gotomasses.inc:479
-msgid "Abort job"
-msgstr "Annuler le job"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
+msgstr "Verrouillé"
 
-#: addons/goto/class_gotomasses.inc:525
-msgid "Waiting"
-msgstr "Avertissement"
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
+msgstr "Deverrouillé"
 
-#: addons/goto/class_gotomasses.inc:531
-msgid "Processed"
-msgstr "Terminé"
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
+msgid "Resume"
+msgstr "Redémarrer"
 
-#: addons/goto/class_gotomasses.inc:546
-msgid "Detection"
-msgstr "Détection"
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
+msgid "Pause"
+msgstr "Suspendre"
 
-#: addons/goto/class_gotomasses.inc:554
-msgid "in progress"
-msgstr "en cours"
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
+msgid "Abort"
+msgstr "Annuler"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr "Immédiatement"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "Au dessus"
 
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "Impossible de mettre à jour les files d'attente: %s"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "En bas"
 
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr "Impossible de mettre à jour les files d'attentes."
+#: addons/goto/deploy-list.xml:225
+#, fuzzy
+msgid "Process now"
+msgstr "Terminé"
 
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr "La classe obligatoire '%s' n'a pas été trouvée: job non annulé !"
+#: addons/goto/deploy-list.xml:233
+msgid "View logs"
+msgstr "Voir les journaux systèmes"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "Impossible de charger les entrées de la queue: %s"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-msgid "System deployment"
-msgstr "Déploiement de système"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr "Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
-
 #: addons/goto/log_view.tpl:7
 msgid "Available logs"
 msgstr "Journaux systèmes disponibles"
@@ -3106,11 +3106,6 @@ msgstr "Sélectionner le journal système"
 msgid "No logs for this host available!"
 msgstr "Pas de journaux systèmes disponibles pour cet hôte !"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr "Verrouillé"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3175,11 +3170,6 @@ msgstr "Rechargement de Goto"
 msgid "Reload GOto settings"
 msgstr "Recharger les paramètres GOto"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr "Deverrouillé"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 msgid "Abort installation"
@@ -3337,7 +3327,8 @@ msgid "Show users"
 msgstr "Utilisateurs"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
-msgid "List of systems"
+#, fuzzy
+msgid "List of target systems"
 msgstr "Systèmes"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3367,7 +3358,8 @@ msgid "List of users"
 msgstr "Liste des utilisateurs"
 
 #: addons/goto/class_goto_import_file.inc:90
-msgid "Selected entries will be skipped because of errors. Do you want to proceed?"
+msgid ""
+"Selected entries will be skipped because of errors. Do you want to proceed?"
 msgstr ""
 "Les entrées sélectionnées seront ignorées à cause des erreurs qu'elle "
 "contiennent. Voulez vous continuer ?"
@@ -3375,7 +3367,8 @@ msgstr ""
 #: addons/goto/class_goto_import_file.inc:131
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
+msgstr ""
+"L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
 
 #: personal/environment/class_environment.inc:9
 #: personal/environment/class_environment.inc:433
@@ -3437,7 +3430,8 @@ msgstr ""
 
 #: personal/environment/class_environment.inc:364
 #, php-format
-msgid "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
+msgid ""
+"Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 "Le serveur de profil sélectionné '%s' n'est plus disponible. Le profil Kiosk "
 "sera désactivé."
@@ -3672,3 +3666,31 @@ msgstr "Dernier script"
 msgid "Script can be replaced by user"
 msgstr "Le script peut être remplacé par l'utilisateur"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Sélectionnez la branche où sera placée le groupe"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
+
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Sélectionnez la branche où sera enregistrée le terminal"
+
+#~ msgid "Deployment status"
+#~ msgstr "Etat du déploiement"
+
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "Ce menu vous permet d'effacer et d'éditer les propriétés des tâches GOsa."
+
+#~ msgid "Pause job"
+#~ msgstr "Suspendre le job"
+
+#~ msgid "Resume job"
+#~ msgstr "Redémarrer le job"
+
+#~ msgid "Execute now"
+#~ msgstr "Exécuter maintenant"
+
+#~ msgid "Abort job"
+#~ msgstr "Annuler le job"

diff --git a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
index ba3ee58a7e863647ee24c4e8c12dde02cc9bca90..be545dfe102e180c65d0c76791b10d57eea50592 100644 (file)
--- a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -33,82 +33,82 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Generale"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 #, fuzzy
 msgid "NTP server"
 msgstr "server"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 #, fuzzy
 msgid "Mode"
 msgstr "Dominio"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 #, fuzzy
 msgid "Select terminal mode"
 msgstr "Seleziona un sistema da aggiungere"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 #, fuzzy
 msgid "Syslog server"
 msgstr "Mostra server"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 #, fuzzy
 msgid "Choose server to use for logging"
 msgstr "Scegli il subtree per l'utente"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 #, fuzzy
 msgid "Root server"
 msgstr "server"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 #, fuzzy
 msgid "Select NFS root filesystem to use"
 msgstr "Seleziona un sistema da aggiungere"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 #, fuzzy
 msgid "Swap server"
 msgstr "Mostra server"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 #, fuzzy
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Scegli il subtree per l'utente"
@@ -118,42 +118,42 @@ msgstr "Scegli il subtree per l'utente"
 msgid "Inherit all values to group members"
 msgstr "Lista dei gruppi"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Azione"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 #, fuzzy
 msgid "Select action to execute for this terminal"
 msgstr "Mostra gruppi che contengono terminali"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Esegui"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 #, fuzzy
 msgid "Activated"
 msgstr "Privato"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 #, fuzzy
 msgid "Local swap"
 msgstr "Nome locazione"
@@ -172,7 +172,7 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -190,53 +190,55 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Seleziona per mostrare le applicazioni"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 #, fuzzy
 msgid "Event error"
 msgstr "Stato"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Cambia la password"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 #, fuzzy
@@ -258,15 +260,16 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -291,15 +294,15 @@ msgstr "Log di sitema"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -308,18 +311,18 @@ msgstr "Log di sitema"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 #, fuzzy
@@ -337,14 +340,14 @@ msgid "System group"
 msgstr "Accesso ai sistemi"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 #, fuzzy
 msgid "Action flag"
 msgstr "Azione"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 #, fuzzy
 msgid "Ntp server"
 msgstr "Servizi"
@@ -387,43 +390,43 @@ msgid "Reset"
 msgstr "reset"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 #, fuzzy
 msgid "Application settings"
 msgstr "Opzioni applicazione"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -484,8 +487,8 @@ msgstr "Mostra applicazioni"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Applicazione"
 
@@ -524,13 +527,13 @@ msgid "Folder"
 msgstr "Filtri"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 #, fuzzy
 msgid "Move up"
 msgstr "Dominio"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 #, fuzzy
 msgid "Move down"
 msgstr "Dominio"
@@ -545,9 +548,8 @@ msgstr "Dominio"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -555,7 +557,7 @@ msgstr "Rimuovi"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Modifica"
@@ -604,7 +606,7 @@ msgid "List of devices"
 msgstr "Lista degli utenti"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -612,26 +614,26 @@ msgstr "Lista degli utenti"
 msgid "Device"
 msgstr "Dispositivi"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -644,7 +646,7 @@ msgstr "Descrizione"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Azioni"
 
@@ -652,7 +654,7 @@ msgstr "Azioni"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Creare"
 
@@ -667,70 +669,71 @@ msgid "Remove device"
 msgstr "Elimina foto"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 #, fuzzy
 msgid "Device name"
 msgstr "Nome"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 #, fuzzy
 msgid "Device type"
 msgstr "Dispositivi"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 #, fuzzy
 msgid "Choose the device type"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "Serial number"
 msgstr "Numero di telefono"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "(iSerial)"
 msgstr "Terminali"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr ""
 
@@ -747,32 +750,33 @@ msgstr ""
 msgid "Filter"
 msgstr "Filtri"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 #, fuzzy
 msgid "USB stick"
 msgstr "statico"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 #, fuzzy
 msgid "iSerial"
 msgstr "Terminali"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -782,21 +786,24 @@ msgstr "Terminali"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -806,17 +813,17 @@ msgstr "Terminali"
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Device generic"
 msgstr "Cognome"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Hotplug"
 msgstr "Dispositivi del client"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -828,18 +835,18 @@ msgstr "Dispositivi del client"
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Terminali"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 #, fuzzy
 msgid "Vendor"
 msgstr "Server"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 #, fuzzy
 msgid "Device ID"
 msgstr "Dispositivi"
@@ -914,7 +921,7 @@ msgid "Application parameter settings"
 msgstr "Nome applicazione"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Nome applicazione"
 
@@ -923,7 +930,7 @@ msgid "Display name"
 msgstr "Mostra il nome"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -937,16 +944,14 @@ msgid "Choose subtree to place application in"
 msgstr "Scegli il subtree per l'utente"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 #, fuzzy
 msgid "Select a base"
 msgstr "Rimuovi"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Icna"
 
@@ -975,28 +980,28 @@ msgid "Options"
 msgstr "Opzioni"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr ""
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 #, fuzzy
 msgid "Replace user configuration on startup"
 msgstr "File di configurazione"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr ""
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr ""
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -1006,8 +1011,7 @@ msgid "Script"
 msgstr "Script"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -1047,47 +1051,47 @@ msgstr "applicazioni"
 msgid "no example"
 msgstr "incompleto"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, fuzzy, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 #, fuzzy
 msgid "no read permission"
 msgstr "Permessi"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 #, fuzzy
 msgid "cannot convert image"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, fuzzy, php-format
 msgid "cannot save image to '%s'"
 msgstr "Rimuovi"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 #, fuzzy
 msgid "Execute path"
 msgstr "Esegui"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 #, fuzzy
 msgid "Application generic"
 msgstr "Nome applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 #, fuzzy
 msgid "Script content"
 msgstr "Mostra terminali"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 #, fuzzy
 msgid "Mime types"
 msgstr "Tipo"
@@ -1111,7 +1115,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Prego inserire un numero di telefono valido!"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 #, fuzzy
 msgid "Mime group"
 msgstr "Gruppo primario"
@@ -1139,7 +1143,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtri"
@@ -1202,22 +1206,22 @@ msgstr "Modifica questo record"
 msgid "Remove mimetype"
 msgstr "Elimina foto"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 #, fuzzy
 msgid "File pattern"
 msgstr "Filtri"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 #, fuzzy
 msgid "Mime type generic"
 msgstr "Tipo"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 #, fuzzy
 msgid "Left click action"
 msgstr "Crea estensioni per le applicazioni"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 #, fuzzy
 msgid "Embedded applications"
 msgstr "Applicazioni in uso"
@@ -1494,27 +1498,23 @@ msgid "Workstation template"
 msgstr "Messaggio di di risposta automatica"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 #, fuzzy
 msgid "Workstation name"
 msgstr "Mostra workstation"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Località"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Scegli il subtree dove mettere il gruppo"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr ""
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 #, fuzzy
 msgid "Inherit all values from group"
 msgstr "Lista dei gruppi"
@@ -1657,129 +1657,129 @@ msgstr "Gruppo di oggetti"
 msgid "none"
 msgstr "nessuno"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 #, fuzzy
 msgid "printer"
 msgstr "stampanti"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 #, fuzzy
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 #, fuzzy
 msgid "Remove printer extension"
 msgstr "Elimina foto"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 #, fuzzy
 msgid "Not defined"
 msgstr "non definito"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 #, fuzzy
 msgid "Can't get ppd informations."
 msgstr "Informazioni personali"
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 #, fuzzy
 msgid "terminal"
 msgstr "Terminali"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
 msgstr "Nome applicazione"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 #, fuzzy
 msgid "Object is no printer!"
 msgstr "Nome dell'oggetto"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "URL della stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 #, fuzzy
 msgid "Print generic"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1787,44 +1787,44 @@ msgstr "Stampante"
 msgid "Printer"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Permessi"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "printer user"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "L'indirizzo principale inserito è già in uso."
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "La password immessa come 'Nuova password' è vuota"
@@ -1942,7 +1942,7 @@ msgid "System informations"
 msgstr "Informazioni personali"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1950,8 +1950,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 #, fuzzy
 msgid "Terminal"
@@ -2269,57 +2269,59 @@ msgstr "Servizi"
 msgid "GUI"
 msgstr "UID"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Crea estensioni telefoniche"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 #, fuzzy
 msgid "Software deployment"
 msgstr "Sistemi"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Mostra workstation"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #, fuzzy
 msgid "Goto mode"
 msgstr "nella cartella"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #, fuzzy
 msgid "Root password"
 msgstr "Cambia password"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Creare"
@@ -2392,7 +2394,7 @@ msgstr "Telefono"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Driver"
 
@@ -2457,7 +2459,6 @@ msgstr "Impossibile connettersi al server del database!"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 #, fuzzy
 msgid "Reload"
 msgstr "leggere"
@@ -2720,17 +2721,17 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "set"
 msgstr "reset"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Mostra server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Opzioni di posta dell'identità"
@@ -2743,37 +2744,33 @@ msgstr "Generale"
 msgid "Printer name"
 msgstr "Nome della stampante"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Scegli il subtree per l'utente"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Dettagli"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 #, fuzzy
 msgid "Printer location"
 msgstr "Impostazioni Unix"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 #, fuzzy
 msgid "Users which are allowed to use this printer"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Utenti"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 #, fuzzy
 msgid "Admins"
 msgstr "DN dell'amministratore"
@@ -2828,12 +2825,7 @@ msgstr "Template"
 msgid "Terminal name"
 msgstr "Terminali"
 
-#: admin/systems/goto/terminal.tpl:31
-#, fuzzy
-msgid "Choose subtree to place terminal in"
-msgstr "Scegli il subtree per l'utente"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 #, fuzzy
 msgid "Inherit all"
 msgstr "Iniziali"
@@ -3123,7 +3115,7 @@ msgstr "Timeout"
 msgid "MAC"
 msgstr "ACL"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 #, fuzzy
 msgid "Event"
@@ -3161,51 +3153,76 @@ msgstr "Nome utente"
 msgid "GOto log view"
 msgstr "nella cartella"
 
-#: addons/goto/class_gotomasses.inc:26
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 #, fuzzy
-msgid "Deployment status"
+msgid "System deployment status"
 msgstr "Sistemi"
 
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:175
 #, fuzzy
-msgid "System deployment status"
-msgstr "Sistemi"
+msgid "Waiting"
+msgstr "Attenzione"
+
+#: addons/goto/class_gotomasses.inc:181
+#, fuzzy
+msgid "Processed"
+msgstr "Profili"
+
+#: addons/goto/class_gotomasses.inc:196
+#, fuzzy
+msgid "Detection"
+msgstr "Azione"
+
+#: addons/goto/class_gotomasses.inc:204
+#, fuzzy
+msgid "in progress"
+msgstr "Profili"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:228
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
-msgstr ""
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, fuzzy, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "Rimuovi"
 
-#: addons/goto/class_gotomasses.inc:361
-#, fuzzy
-msgid "List of queued jobs"
-msgstr "Lista degli utenti"
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
-#, fuzzy
-msgid "Resume"
-msgstr "reset"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:381
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
 #, fuzzy
-msgid "Pause"
-msgstr "Data"
+msgid "System deployment"
+msgstr "Dipartimento"
 
-#: addons/goto/class_gotomasses.inc:382
-msgid "Abort"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:10
+#, fuzzy
+msgid "List of queued jobs"
+msgstr "Lista degli utenti"
+
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3228,17 +3245,16 @@ msgstr ""
 msgid "Target"
 msgstr "reset"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 #, fuzzy
 msgid "Period"
 msgstr "Permessi"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3257,8 +3273,7 @@ msgstr "Permessi"
 msgid "Schedule"
 msgstr "Estenzioni PHPGroupware"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3277,85 +3292,56 @@ msgstr "Estenzioni PHPGroupware"
 msgid "Status"
 msgstr "Stato"
 
-#: addons/goto/class_gotomasses.inc:443
-#, fuzzy
-msgid "Pause job"
-msgstr "Data"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
+msgstr ""
+
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:450
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
 #, fuzzy
-msgid "Resume job"
+msgid "Resume"
 msgstr "reset"
 
-#: addons/goto/class_gotomasses.inc:457
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
 #, fuzzy
-msgid "Execute now"
-msgstr "Esegui"
+msgid "Pause"
+msgstr "Data"
 
-#: addons/goto/class_gotomasses.inc:464
-#, fuzzy
-msgid "View logs"
-msgstr "Applicazioni disponibili"
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
+msgid "Abort"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:479
-#, fuzzy
-msgid "Abort job"
-msgstr "Iniziali"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:525
+#: addons/goto/deploy-list.xml:201
 #, fuzzy
-msgid "Waiting"
-msgstr "Attenzione"
+msgid "Down"
+msgstr "Dominio"
 
-#: addons/goto/class_gotomasses.inc:531
+#: addons/goto/deploy-list.xml:225
 #, fuzzy
-msgid "Processed"
+msgid "Process now"
 msgstr "Profili"
 
-#: addons/goto/class_gotomasses.inc:546
+#: addons/goto/deploy-list.xml:233
 #, fuzzy
-msgid "Detection"
-msgstr "Azione"
-
-#: addons/goto/class_gotomasses.inc:554
-#, fuzzy
-msgid "in progress"
-msgstr "Profili"
-
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, fuzzy, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "Rimuovi"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
+msgid "View logs"
+msgstr "Applicazioni disponibili"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, fuzzy, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "Rimuovi"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-#, fuzzy
-msgid "System deployment"
-msgstr "Dipartimento"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 #, fuzzy
 msgid "Available logs"
@@ -3370,11 +3356,6 @@ msgstr "Rimuovi"
 msgid "No logs for this host available!"
 msgstr ""
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr ""
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3444,11 +3425,6 @@ msgstr "nella cartella"
 msgid "Reload GOto settings"
 msgstr "Impostazioni Unix"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr ""
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 #, fuzzy
@@ -3631,7 +3607,7 @@ msgstr "Mostra server"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
 #, fuzzy
-msgid "List of systems"
+msgid "List of target systems"
 msgstr "Lista degli utenti"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3995,6 +3971,36 @@ msgstr "Non ci sono certificati installati"
 msgid "Script can be replaced by user"
 msgstr ""
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Scegli il subtree dove mettere il gruppo"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Scegli il subtree per l'utente"
+
+#, fuzzy
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Scegli il subtree per l'utente"
+
+#, fuzzy
+#~ msgid "Deployment status"
+#~ msgstr "Sistemi"
+
+#, fuzzy
+#~ msgid "Pause job"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Resume job"
+#~ msgstr "reset"
+
+#, fuzzy
+#~ msgid "Execute now"
+#~ msgstr "Esegui"
+
+#, fuzzy
+#~ msgid "Abort job"
+#~ msgstr "Iniziali"
+
 #, fuzzy
 #~ msgid "Add user"
 #~ msgstr "Modifica contatto"
@@ -5804,10 +5810,6 @@ msgstr ""
 #~ msgid "Groups"
 #~ msgstr "Gruppi di utenti"
 
-#, fuzzy
-#~ msgid "Down"
-#~ msgstr "Dominio"
-
 #, fuzzy
 #~ msgid "No ACL settings for this category!"
 #~ msgstr "Nome descrittivo del gruppo"

diff --git a/gosa-plugins/goto/locale/messages.po b/gosa-plugins/goto/locale/messages.po
index 81b14f8f5b90a161828de572a15a7b8ed6495d8a..b028b12214d3e19bdb817f468655be8a51a3733e 100644 (file)
--- a/gosa-plugins/goto/locale/messages.po
+++ b/gosa-plugins/goto/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,74 +34,74 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
@@ -109,40 +109,40 @@ msgstr ""
 msgid "Inherit all values to group members"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr ""
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 msgid "Local swap"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -178,51 +178,53 @@ msgstr ""
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 msgid "Event error"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -241,15 +243,16 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -272,15 +275,15 @@ msgstr ""
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -289,18 +292,18 @@ msgstr ""
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 msgid "LDAP error"
@@ -315,13 +318,13 @@ msgid "System group"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 msgid "Ntp server"
 msgstr ""
 
@@ -357,42 +360,42 @@ msgid "Reset"
 msgstr ""
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr ""
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -447,8 +450,8 @@ msgstr ""
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr ""
 
@@ -482,12 +485,12 @@ msgid "Folder"
 msgstr ""
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr ""
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr ""
 
@@ -501,9 +504,8 @@ msgstr ""
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -511,7 +513,7 @@ msgstr ""
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr ""
@@ -553,33 +555,33 @@ msgid "List of devices"
 msgstr ""
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr ""
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -592,7 +594,7 @@ msgstr ""
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr ""
 
@@ -600,7 +602,7 @@ msgstr ""
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr ""
 
@@ -613,65 +615,66 @@ msgid "Remove device"
 msgstr ""
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 msgid "Device type"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 msgid "Choose the device type"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "(iSerial)"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr ""
 
@@ -687,30 +690,31 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 msgid "USB stick"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 msgid "iSerial"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -720,21 +724,24 @@ msgstr ""
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -744,15 +751,15 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Device generic"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 msgid "Hotplug"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -764,16 +771,16 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 msgid "Vendor"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 msgid "Device ID"
 msgstr ""
 
@@ -835,7 +842,7 @@ msgid "Application parameter settings"
 msgstr ""
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr ""
 
@@ -844,7 +851,7 @@ msgid "Display name"
 msgstr ""
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -857,15 +864,13 @@ msgid "Choose subtree to place application in"
 msgstr ""
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr ""
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr ""
 
@@ -893,27 +898,27 @@ msgid "Options"
 msgstr ""
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr ""
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr ""
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr ""
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr ""
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -923,8 +928,7 @@ msgid "Script"
 msgstr ""
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -958,42 +962,42 @@ msgstr ""
 msgid "no example"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 msgid "no read permission"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 msgid "cannot convert image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, php-format
 msgid "cannot save image to '%s'"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 msgid "Execute path"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 msgid "Application generic"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 msgid "Script content"
 msgstr ""
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 msgid "Mime types"
 msgstr ""
 
@@ -1013,7 +1017,7 @@ msgid "Please enter a name for the mime type here"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 msgid "Mime group"
 msgstr ""
 
@@ -1038,7 +1042,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 msgid "File patterns"
 msgstr ""
 
@@ -1093,19 +1097,19 @@ msgstr ""
 msgid "Remove mimetype"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 msgid "File pattern"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 msgid "Mime type generic"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 msgid "Left click action"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 msgid "Embedded applications"
 msgstr ""
 
@@ -1349,26 +1353,22 @@ msgid "Workstation template"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr ""
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr ""
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 msgid "Inherit all values from group"
 msgstr ""
 
@@ -1493,119 +1493,119 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 msgid "printer"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 msgid "Not defined"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 msgid "Object is no printer!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 msgid "Print generic"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1613,41 +1613,41 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 msgid "Printer PPD"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "printer user"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, php-format
 msgid "'%s' is already used!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, php-format
 msgid "'%s' does not exist!"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid "System informations"
 msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1761,8 +1761,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr ""
@@ -2052,52 +2052,54 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 msgid "Software deployment"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 msgid "Workstation generic"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 msgid "Goto mode"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 msgid "Root password"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 msgid "Create FAI CD"
 msgstr ""
 
@@ -2163,7 +2165,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr ""
 
@@ -2225,7 +2227,6 @@ msgstr ""
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 msgid "Reload"
 msgstr ""
 
@@ -2458,15 +2459,15 @@ msgstr ""
 msgid "set"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 msgid "Terminal generic"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 msgid "Syslog server enabled"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 msgid "Ntp server settings"
 msgstr ""
 
@@ -2478,35 +2479,31 @@ msgstr ""
 msgid "Printer name"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr ""
 
@@ -2556,11 +2553,7 @@ msgstr ""
 msgid "Terminal name"
 msgstr ""
 
-#: admin/systems/goto/terminal.tpl:31
-msgid "Choose subtree to place terminal in"
-msgstr ""
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 msgid "Inherit all"
 msgstr ""
 
@@ -2827,7 +2820,7 @@ msgstr ""
 msgid "MAC"
 msgstr ""
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 msgid "Event"
 msgstr ""
@@ -2861,45 +2854,68 @@ msgstr ""
 msgid "GOto log view"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:26
-msgid "Deployment status"
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
+msgid "System deployment status"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
-msgid "System deployment status"
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:175
+msgid "Waiting"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:181
+msgid "Processed"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:196
+msgid "Detection"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:204
+msgid "in progress"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:228
 msgid "Permission"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, php-format
+msgid "Cannot update queue entry: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:361
-msgid "List of queued jobs"
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
-msgid "Resume"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:381
-msgid "Pause"
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
+msgid "System deployment"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:382
-msgid "Abort"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr ""
+
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -2921,16 +2937,15 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 msgid "Period"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -2948,8 +2963,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -2968,75 +2982,51 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:443
-msgid "Pause job"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:450
-msgid "Resume job"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:457
-msgid "Execute now"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:464
-msgid "View logs"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:479
-msgid "Abort job"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:525
-msgid "Waiting"
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:531
-msgid "Processed"
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
+msgid "Resume"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:546
-msgid "Detection"
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
+msgid "Pause"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:554
-msgid "in progress"
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
+msgid "Abort"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, php-format
-msgid "Cannot update queue entry: %s"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
+#: addons/goto/deploy-list.xml:225
+msgid "Process now"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
+#: addons/goto/deploy-list.xml:233
+msgid "View logs"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, php-format
 msgid "Cannot load queue entries: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-msgid "System deployment"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 msgid "Available logs"
 msgstr ""
@@ -3049,11 +3039,6 @@ msgstr ""
 msgid "No logs for this host available!"
 msgstr ""
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr ""
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3118,11 +3103,6 @@ msgstr ""
 msgid "Reload GOto settings"
 msgstr ""
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr ""
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 msgid "Abort installation"
@@ -3280,7 +3260,7 @@ msgid "Show users"
 msgstr ""
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
-msgid "List of systems"
+msgid "List of target systems"
 msgstr ""
 
 #: addons/goto/events/eventTargetSystems-list.xml:89

diff --git a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
index cf66c717a3ca6269d5ca2c7f23ac1c5aa400952e..b80ec0c8459dbf31ece8d416abe9acb057b2a4bb 100644 (file)
--- a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -40,74 +40,74 @@ msgstr ""
 "clients die aan deze objectgroep worden toegekend."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Algemeen"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "NTP tijdserver"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Selecteer terminal modus"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Syslog server"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Root server"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Swap server"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
 
@@ -116,40 +116,40 @@ msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
 msgid "Inherit all values to group members"
 msgstr "Lijst met groepen"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Actie"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Selecteer de voor deze terminal uit te voeren actie"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Commando"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "Geactiveerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "Geblokkeerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 #, fuzzy
 msgid "Local swap"
 msgstr "Naam van de locatie"
@@ -168,7 +168,7 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -186,53 +186,55 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "overerfd"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Zoek binnen subtree"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 #, fuzzy
 msgid "Event error"
 msgstr "Fout"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Uitschakelen"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -252,15 +254,16 @@ msgid "Wake"
 msgstr "Aanzetten"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Herinstalleer"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -283,15 +286,15 @@ msgstr "Systeem analyse"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -300,18 +303,18 @@ msgstr "Systeem analyse"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 #, fuzzy
@@ -328,14 +331,14 @@ msgid "System group"
 msgstr "Systeem status"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 #, fuzzy
 msgid "Action flag"
 msgstr "Actie"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP tijdserver"
@@ -377,42 +380,42 @@ msgid "Reset"
 msgstr "stel in"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "Programma instellingen"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -470,8 +473,8 @@ msgstr "Toon programma's"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Programma"
 
@@ -509,12 +512,12 @@ msgid "Folder"
 msgstr "Filters"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "Omhoog verplaatsen"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "Omlaag verplaatsen"
 
@@ -528,9 +531,8 @@ msgstr "Omlaag verplaatsen"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -538,7 +540,7 @@ msgstr "Verwijderen"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Bewerken"
@@ -590,33 +592,33 @@ msgid "List of devices"
 msgstr "Lijst met apparaten"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "Apparaat"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -629,7 +631,7 @@ msgstr "Omschrijving"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Acties"
 
@@ -637,7 +639,7 @@ msgstr "Acties"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -652,70 +654,71 @@ msgid "Remove device"
 msgstr "Plaatje verwijderen"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Apparaten"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "Apparaat naam"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 #, fuzzy
 msgid "Device type"
 msgstr "Apparaat naam"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 #, fuzzy
 msgid "Choose the device type"
 msgstr "Kies een telefoontype"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "Serienummer"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "(iSerial)"
 msgstr "Serieel"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 #, fuzzy
 msgid "Vendor-ID"
 msgstr "Afzender ID"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 #, fuzzy
 msgid "(idVendor)"
 msgstr "Afzender ID"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr ""
 
@@ -732,32 +735,33 @@ msgstr ""
 msgid "Filter"
 msgstr "Filters"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 #, fuzzy
 msgid "USB stick"
 msgstr "sticky"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 #, fuzzy
 msgid "iSerial"
 msgstr "Serieel"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -767,21 +771,24 @@ msgstr "Serieel"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -791,17 +798,17 @@ msgstr "Serieel"
 msgid "Error"
 msgstr "Fout"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Device generic"
 msgstr "Servernaam"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Hotplug"
 msgstr "Hotplug apparaten"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -813,18 +820,18 @@ msgstr "Hotplug apparaten"
 msgid "Type"
 msgstr "Type"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Serieel"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 #, fuzzy
 msgid "Vendor"
 msgstr "Afzender ID"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 #, fuzzy
 msgid "Device ID"
 msgstr "Apparaat"
@@ -891,7 +898,7 @@ msgid "Application parameter settings"
 msgstr "Programmanaam"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Programmanaam"
 
@@ -900,7 +907,7 @@ msgid "Display name"
 msgstr "Getoonde naam"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Te tonen programma naam (bv. onder iconen)"
 
@@ -913,15 +920,13 @@ msgid "Choose subtree to place application in"
 msgstr "Selecteer de subtree waaronder het programma geplaatst zal worden."
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "Selecteer een basis"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Icoon"
 
@@ -950,27 +955,27 @@ msgid "Options"
 msgstr "Opties"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Alleen uitvoerbaar voor groepsleden"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Vervang gebruikers configuratie bij opstarten"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Plaats icoon op de desktop van groepsleden"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Plaats programma in het startmenu van groepsleden"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "Plaats invoer in snelstartbalk van groepsleden"
 
@@ -980,8 +985,7 @@ msgid "Script"
 msgstr "Script"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -1018,49 +1022,49 @@ msgstr "programma"
 msgid "no example"
 msgstr "geen voorbeeld"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, fuzzy, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 "U kunt deze bijlage niet verwijderen, aangezien deze nog steeds in gebruik "
 "is door deze systemen: '%s'"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 #, fuzzy
 msgid "no read permission"
 msgstr "Rechten"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 #, fuzzy
 msgid "cannot convert image"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, fuzzy, php-format
 msgid "cannot save image to '%s'"
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 #, fuzzy
 msgid "Execute path"
 msgstr "Commando"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 #, fuzzy
 msgid "Application generic"
 msgstr "Programmanaam"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 #, fuzzy
 msgid "Script content"
 msgstr "Variabele inhoud"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 #, fuzzy
 msgid "Mime types"
 msgstr "MIME-type"
@@ -1084,7 +1088,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Voer a.u.b. een naam voor de conferentie in."
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 #, fuzzy
 msgid "Mime group"
 msgstr "Primaire groep"
@@ -1113,7 +1117,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 #, fuzzy
 msgid "File patterns"
 msgstr "Filters"
@@ -1176,22 +1180,22 @@ msgstr "Bewerk deze invoer"
 msgid "Remove mimetype"
 msgstr "Plaatje verwijderen"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 #, fuzzy
 msgid "File pattern"
 msgstr "Filters"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 #, fuzzy
 msgid "Mime type generic"
 msgstr "MIME-type"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 #, fuzzy
 msgid "Left click action"
 msgstr "Programma's aanmaken"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 #, fuzzy
 msgid "Embedded applications"
 msgstr "Gebruikte programma's"
@@ -1456,26 +1460,22 @@ msgid "Workstation template"
 msgstr "Werkstation sjabloon"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Werkstation naam"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Plaats"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "Tijdserver attributen overerven"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 #, fuzzy
 msgid "Inherit all values from group"
 msgstr "Lijst met groepen"
@@ -1610,13 +1610,13 @@ msgstr "Objectgroep"
 msgid "none"
 msgstr "geen"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, fuzzy, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
@@ -1624,16 +1624,16 @@ msgstr ""
 "Kon geen geldige basis ophalen uit de dn van het object. Basis is ingesteld "
 "op '%s'."
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "Voeg printer extensie toe"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 #, fuzzy
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
@@ -1641,25 +1641,25 @@ msgid ""
 msgstr ""
 "Kon de printertab niet initialiseren. Parameter parent ontbrak bij aanmaak."
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 #, fuzzy
 msgid "printer"
 msgstr "printers"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 #, fuzzy
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
@@ -1669,76 +1669,76 @@ msgstr ""
 "inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
 "dat u een nieuwe terminal sjabloon aan het maken bent."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "Verwijder printer mogelijkheden"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 #, fuzzy
 msgid "Not defined"
 msgstr "niet gedefiniëerd"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "Kan de PPD informatie niet ophalen."
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, fuzzy, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 "Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
 msgstr "Werkstation"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 #, fuzzy
 msgid "Object is no printer!"
 msgstr "Netwerk printer"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "Printer URL"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Groep"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Gebruiker"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 #, fuzzy
 msgid "Print generic"
 msgstr "Print Service"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1746,44 +1746,44 @@ msgstr "Print Service"
 msgid "Printer"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Rechten"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "printer user"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "PPD beheerder : Het opgegeven pad '%s' bestaat niet."
@@ -1901,7 +1901,7 @@ msgid "System informations"
 msgstr "Systeem informatie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1909,8 +1909,8 @@ msgstr "Werkstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -2218,57 +2218,59 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Onmiddelijk bijwerken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 #, fuzzy
 msgid "Software deployment"
 msgstr "Systeemtype"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Werkstation naam"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #, fuzzy
 msgid "Goto mode"
 msgstr "naar map"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #, fuzzy
 msgid "Root password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Aanmaken"
@@ -2335,7 +2337,7 @@ msgstr "Telefoon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Stuurprogramma"
 
@@ -2398,7 +2400,6 @@ msgstr "Kies de methode om te verbinden met de terminal server"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 #, fuzzy
 msgid "Reload"
 msgstr "Lezen"
@@ -2662,17 +2663,17 @@ msgstr "Toegekende FAI klasses"
 msgid "set"
 msgstr "stel in"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Service"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Syslog server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Gebruikersinstellingen"
@@ -2685,35 +2686,31 @@ msgstr "Algemeen"
 msgid "Printer name"
 msgstr "Printernaam"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Details"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "Printer locatie"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "Gebruikers die deze printer mogen gebruiken"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Gebruikers"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "Gebruikers die deze printer mogen beheren"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "Beheerders"
 
@@ -2770,12 +2767,7 @@ msgstr "Terminal sjabloon"
 msgid "Terminal name"
 msgstr "Terminal naam"
 
-#: admin/systems/goto/terminal.tpl:31
-#, fuzzy
-msgid "Choose subtree to place terminal in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 #, fuzzy
 msgid "Inherit all"
 msgstr "Initialen"
@@ -3066,7 +3058,7 @@ msgstr "Timeout"
 msgid "MAC"
 msgstr "Rechten"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 #, fuzzy
 msgid "Event"
@@ -3104,55 +3096,76 @@ msgstr "Inlognaam"
 msgid "GOto log view"
 msgstr "naar map"
 
-#: addons/goto/class_gotomasses.inc:26
-#, fuzzy
-msgid "Deployment status"
-msgstr "Systeem status"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 #, fuzzy
 msgid "System deployment status"
 msgstr "Systeemtype"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:175
+#, fuzzy
+msgid "Waiting"
+msgstr "Waarschuwing"
+
+#: addons/goto/class_gotomasses.inc:181
+#, fuzzy
+msgid "Processed"
+msgstr "Eigenschappen"
+
+#: addons/goto/class_gotomasses.inc:196
+#, fuzzy
+msgid "Detection"
+msgstr "Sectie"
+
+#: addons/goto/class_gotomasses.inc:204
+#, fuzzy
+msgid "in progress"
+msgstr "Eigenschappen"
+
+#: addons/goto/class_gotomasses.inc:228
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-#, fuzzy
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, fuzzy, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "Onbekende FAI status %s"
+
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
-"Dit menu maakt het mogelijk om FAI verzamelplaatsen aan te maken, bewerken "
-"en verwijderen."
 
-#: addons/goto/class_gotomasses.inc:361
-#, fuzzy
-msgid "List of queued jobs"
-msgstr "Lijst met apparaten"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
 #, fuzzy
-msgid "Resume"
-msgstr "Herinstalleer"
+msgid "System deployment"
+msgstr "Systeembeheer"
 
-#: addons/goto/class_gotomasses.inc:381
-#, fuzzy
-msgid "Pause"
-msgstr "Plakken"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:382
+#: addons/goto/deploy-list.xml:10
 #, fuzzy
-msgid "Abort"
-msgstr "Poort"
+msgid "List of queued jobs"
+msgstr "Lijst met apparaten"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3175,17 +3188,16 @@ msgstr "Poort"
 msgid "Target"
 msgstr "Chipset"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "Taak"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 #, fuzzy
 msgid "Period"
 msgstr "Rechten"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3204,8 +3216,7 @@ msgstr "Rechten"
 msgid "Schedule"
 msgstr "PHPScheduleIt"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3224,85 +3235,58 @@ msgstr "PHPScheduleIt"
 msgid "Status"
 msgstr "Status"
 
-#: addons/goto/class_gotomasses.inc:443
-#, fuzzy
-msgid "Pause job"
-msgstr "Plakken"
-
-#: addons/goto/class_gotomasses.inc:450
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
 #, fuzzy
-msgid "Resume job"
-msgstr "Herinstalleer"
+msgid "Lock"
+msgstr "Geblokkeerd"
 
-#: addons/goto/class_gotomasses.inc:457
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
 #, fuzzy
-msgid "Execute now"
-msgstr "Commando"
+msgid "Unlock"
+msgstr "Geblokkeerd"
 
-#: addons/goto/class_gotomasses.inc:464
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
 #, fuzzy
-msgid "View logs"
-msgstr "Beschikbare programma's"
+msgid "Resume"
+msgstr "Herinstalleer"
 
-#: addons/goto/class_gotomasses.inc:479
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
 #, fuzzy
-msgid "Abort job"
-msgstr "Initialen"
+msgid "Pause"
+msgstr "Plakken"
 
-#: addons/goto/class_gotomasses.inc:525
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
 #, fuzzy
-msgid "Waiting"
-msgstr "Waarschuwing"
+msgid "Abort"
+msgstr "Poort"
 
-#: addons/goto/class_gotomasses.inc:531
-#, fuzzy
-msgid "Processed"
-msgstr "Eigenschappen"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "Omhoog"
 
-#: addons/goto/class_gotomasses.inc:546
-#, fuzzy
-msgid "Detection"
-msgstr "Sectie"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "Omlaag"
 
-#: addons/goto/class_gotomasses.inc:554
+#: addons/goto/deploy-list.xml:225
 #, fuzzy
-msgid "in progress"
+msgid "Process now"
 msgstr "Eigenschappen"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, fuzzy, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "Onbekende FAI status %s"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
+#: addons/goto/deploy-list.xml:233
+#, fuzzy
+msgid "View logs"
+msgstr "Beschikbare programma's"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, fuzzy, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "Onbekende FAI status %s"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-#, fuzzy
-msgid "System deployment"
-msgstr "Systeembeheer"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 #, fuzzy
 msgid "Available logs"
@@ -3318,12 +3302,6 @@ msgstr "Selecteer"
 msgid "No logs for this host available!"
 msgstr "Bestand is beschikbaar"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-#, fuzzy
-msgid "Lock"
-msgstr "Geblokkeerd"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3393,12 +3371,6 @@ msgstr "naar map"
 msgid "Reload GOto settings"
 msgstr "Posix instellingen"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-#, fuzzy
-msgid "Unlock"
-msgstr "Geblokkeerd"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 #, fuzzy
@@ -3581,7 +3553,7 @@ msgstr "Toon servers"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
 #, fuzzy
-msgid "List of systems"
+msgid "List of target systems"
 msgstr "Lijst met gebruikers"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3924,6 +3896,43 @@ msgstr "Laatste script"
 msgid "Script can be replaced by user"
 msgstr "Script kan vervangen worden door gebruiker"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#, fuzzy
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#, fuzzy
+#~ msgid "Deployment status"
+#~ msgstr "Systeem status"
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "Dit menu maakt het mogelijk om FAI verzamelplaatsen aan te maken, "
+#~ "bewerken en verwijderen."
+
+#, fuzzy
+#~ msgid "Pause job"
+#~ msgstr "Plakken"
+
+#, fuzzy
+#~ msgid "Resume job"
+#~ msgstr "Herinstalleer"
+
+#, fuzzy
+#~ msgid "Execute now"
+#~ msgstr "Commando"
+
+#, fuzzy
+#~ msgid "Abort job"
+#~ msgstr "Initialen"
+
 #~ msgid "Submit"
 #~ msgstr "Verwerk"
 
@@ -6033,9 +6042,6 @@ msgstr "Script kan vervangen worden door gebruiker"
 #~ msgid "Go up one department"
 #~ msgstr "Ga een afdeling omhoog"
 
-#~ msgid "Up"
-#~ msgstr "Omhoog"
-
 #~ msgid "Go to users department"
 #~ msgstr "Ga naar gebruikers afdeling"
 
@@ -6104,9 +6110,6 @@ msgstr "Script kan vervangen worden door gebruiker"
 #~ msgid "Groups"
 #~ msgstr "Groepen"
 
-#~ msgid "Down"
-#~ msgstr "Omlaag"
-
 #, fuzzy
 #~ msgid "category ACL"
 #~ msgstr "Categorie"

diff --git a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
index 634500ad9e8bc929f4a768d90a5703f221016f6c..cf095bab569c2db7f8d39e03f7053d2d66b7cf09 100644 (file)
--- a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -35,74 +35,74 @@ msgstr ""
 "klientów przypisanych do tych grup obiektów."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Ogólne"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Serwer NTP"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "Proszę wybrać serwer do synchronizacji czasu"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Tryb"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Proszę wybrać tryb terminala"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Serwer Syslog"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Proszę wybrać serwer do logowania"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Serwer NFS"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Proszę wybrać główny system plików NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Serwer Swap"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Proszę wybrać system plików NFS dla plików swap"
 
@@ -111,40 +111,40 @@ msgstr "Proszę wybrać system plików NFS dla plików swap"
 msgid "Inherit all values to group members"
 msgstr "Lista grup"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Akcja"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Proszę wybrać akcję do wykonania dla tego terminala"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Uruchom"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "Aktywne"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "Zablokowane"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 #, fuzzy
 msgid "Local swap"
 msgstr "Nazwa lokalizacji"
@@ -163,7 +163,7 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -181,53 +181,55 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "odziedziczony"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 #, fuzzy
 msgid "Event error"
 msgstr "Błąd"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Brak uprawnień do zmiay hasła"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Wyłącz"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -247,15 +249,16 @@ msgid "Wake"
 msgstr "Zbudź"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Przeinstaluj"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -278,15 +281,15 @@ msgstr "Analiza systemu"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -295,18 +298,18 @@ msgstr "Analiza systemu"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 #, fuzzy
@@ -322,13 +325,13 @@ msgid "System group"
 msgstr "Grupa systemowa"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 msgid "Action flag"
 msgstr "Flaga akcji"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 msgid "Ntp server"
 msgstr "Serwer NTP"
 
@@ -369,42 +372,42 @@ msgid "Reset"
 msgstr "ustaw"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "Ustawienia Aplikacji"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -461,8 +464,8 @@ msgstr "Grupa aplikacje"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Aplikacja"
 
@@ -500,12 +503,12 @@ msgid "Folder"
 msgstr "Filtry"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "Przesuń w górę"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "Przesuń w dół"
 
@@ -519,9 +522,8 @@ msgstr "Przesuń w dół"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -529,7 +531,7 @@ msgstr "Usuń"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Edytuj"
@@ -579,33 +581,33 @@ msgid "List of devices"
 msgstr "Lista urządzeń"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "Urządzenie"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -618,7 +620,7 @@ msgstr "Opis"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Akcje"
 
@@ -626,7 +628,7 @@ msgstr "Akcje"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Utwórz"
 
@@ -641,71 +643,72 @@ msgid "Remove device"
 msgstr "Usuń obrazek"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "Nazwa urządzenia"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 #, fuzzy
 msgid "Device type"
 msgstr "Nazwa urządzenia"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 #, fuzzy
 msgid "Choose the device type"
 msgstr "Proszę wybrać typ telefonu"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "Numer seryjny"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "(iSerial)"
 msgstr "Szeregowy"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 #, fuzzy
 msgid "Vendor-ID"
 msgstr "ID Dostawcy"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 #, fuzzy
 msgid "(idVendor)"
 msgstr "ID Dostawcy"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 #, fuzzy
 msgid "Product-ID"
 msgstr "ID Produktu"
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 #, fuzzy
 msgid "(idProduct)"
 msgstr "ID Produktu"
@@ -723,32 +726,33 @@ msgstr "ID Produktu"
 msgid "Filter"
 msgstr "Filtry"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 #, fuzzy
 msgid "USB stick"
 msgstr "sticky"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 #, fuzzy
 msgid "iSerial"
 msgstr "Szeregowy"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -758,21 +762,24 @@ msgstr "Szeregowy"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -782,17 +789,17 @@ msgstr "Szeregowy"
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Device generic"
 msgstr "Nazwa serwera"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Hotplug"
 msgstr "Urządzenia Hotplug"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -804,18 +811,18 @@ msgstr "Urządzenia Hotplug"
 msgid "Type"
 msgstr "Typ"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Szeregowy"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 #, fuzzy
 msgid "Vendor"
 msgstr "ID Dostawcy"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 #, fuzzy
 msgid "Device ID"
 msgstr "Urządzenie"
@@ -882,7 +889,7 @@ msgid "Application parameter settings"
 msgstr "Parametr aplikacji"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Nazwa aplikacji"
 
@@ -891,7 +898,7 @@ msgid "Display name"
 msgstr "Wyświetl nazwę"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Wyświetlana nazwa aplikacji (pod ikoną)"
 
@@ -904,15 +911,13 @@ msgid "Choose subtree to place application in"
 msgstr "Wybierz poddrzewo do umieszczenia aplikacji"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "Wybierz bazę"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Ikona"
 
@@ -941,27 +946,27 @@ msgid "Options"
 msgstr "Opcje"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Tylko wykonywalne dla członków"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Podmień konfigurację użytkownika na starcie"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Utwórz ikonę na desktopie członka"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Utwórz wpis w menu startowym członka"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "Utwórz wpis w pasku uruchamiania członka"
 
@@ -971,8 +976,7 @@ msgid "Script"
 msgstr "Skrypt"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -1009,47 +1013,47 @@ msgstr "aplikacja"
 msgid "no example"
 msgstr "brak przykładu"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, fuzzy, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 "Nie można usunąć tego załącznika, jest wciąż używany przez system(y) '%s'"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 #, fuzzy
 msgid "no read permission"
 msgstr "Uprawnienia"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 #, fuzzy
 msgid "cannot convert image"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, fuzzy, php-format
 msgid "cannot save image to '%s'"
 msgstr "Nie można zapisać pliku '%s'."
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 #, fuzzy
 msgid "Execute path"
 msgstr "Uruchom"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 #, fuzzy
 msgid "Application generic"
 msgstr "Nazwa aplikacji"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 msgid "Script content"
 msgstr "Zawartość skryptu"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 msgid "Mime types"
 msgstr "Typy mime"
 
@@ -1069,7 +1073,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Proszę podać nazwę typu mime"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 msgid "Mime group"
 msgstr "Grupa mime"
 
@@ -1095,7 +1099,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 msgid "File patterns"
 msgstr "Wzorce pliku"
 
@@ -1153,20 +1157,20 @@ msgstr "Aktualizuj ikonę typu mime"
 msgid "Remove mimetype"
 msgstr "Usuń obrazek"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 #, fuzzy
 msgid "File pattern"
 msgstr "Wzorce pliku"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 msgid "Mime type generic"
 msgstr "Typ mime podstawowy"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 msgid "Left click action"
 msgstr "Akcja lewego kliknięcia"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 msgid "Embedded applications"
 msgstr "Osadzone aplikacje"
 
@@ -1419,26 +1423,22 @@ msgid "Workstation template"
 msgstr "Szablon stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Nazwa stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Wybierz poddrzewo do umieszczenia grupy"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "Dziedzicz atrybuty serwera czasu"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 #, fuzzy
 msgid "Inherit all values from group"
 msgstr "Lista grup"
@@ -1573,29 +1573,29 @@ msgstr "Grupa obiektu"
 msgid "none"
 msgstr "żaden"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, fuzzy, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 "Nie można wydobyć poprawnej podstawy z obiektu dn, ustawiam podstawę na '%s'."
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "Dodaj rozszerzenie drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 #, fuzzy
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
@@ -1604,25 +1604,25 @@ msgstr ""
 "Nie można zainicjalizować zakładki drukarek, brak parametru parent podzczas "
 "tworzenia."
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "To jest szablon stacji roboczej, zakładka drukarek jest wyłączona."
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "To jest szablon terminala, zakładka drukarek jest wyłączona."
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 #, fuzzy
 msgid "printer"
 msgstr "drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 #, fuzzy
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
@@ -1632,76 +1632,76 @@ msgstr ""
 "'cn' nie jest obecne we wpisie. Prawdopodobnie próbujesz tworzyć nowy "
 "szablon terminala."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "Usuń rozszerzenie drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Wybrany plik PPD '%s' nie istnieje."
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 #, fuzzy
 msgid "Not defined"
 msgstr "nie zdefiniowane"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "Nie można pobrać informacji ppd."
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, fuzzy, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 "Ta drukarka należy do terminala %s. Nie można zmienić nazwy tej drukarki."
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
 msgstr "Stacja robocza"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 #, fuzzy
 msgid "Object is no printer!"
 msgstr "Drukarka sieciowa"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "URL drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Użytkownik"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 #, fuzzy
 msgid "Print generic"
 msgstr "Usługa drukowania"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1709,43 +1709,43 @@ msgstr "Usługa drukowania"
 msgid "Printer"
 msgstr "Drukarka"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 msgid "Printer PPD"
 msgstr "PPD drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "printer user"
 msgstr "Drukarka"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "Ta nazwa jest już w użyciu."
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "Manager PPD: Podana ścieżka '%s' nie istnieje."
@@ -1859,7 +1859,7 @@ msgid "System informations"
 msgstr "Informacja o systemie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1867,8 +1867,8 @@ msgstr "Stacja robocza"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -2164,57 +2164,59 @@ msgstr "Usługa dźwięku"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Natychmiastowe uaktualnienie"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Zbudź"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 #, fuzzy
 msgid "Software deployment"
 msgstr "Typ systemu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Nazwa stacji roboczej"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #, fuzzy
 msgid "Goto mode"
 msgstr "do folferu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #, fuzzy
 msgid "Root password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Utwórz"
@@ -2281,7 +2283,7 @@ msgstr "Telefon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Sterownik"
 
@@ -2343,7 +2345,6 @@ msgstr "Wybierz metodę połączenia z serwerem terminali"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 #, fuzzy
 msgid "Reload"
 msgstr "Odczyt"
@@ -2605,16 +2606,16 @@ msgstr "Przydzielone klasy FAI"
 msgid "set"
 msgstr "ustaw"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Usługa Terminali"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 msgid "Syslog server enabled"
 msgstr "Serwer Syslog włączony"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 msgid "Ntp server settings"
 msgstr "Ustawienia serwera ntp"
 
@@ -2626,35 +2627,31 @@ msgstr "Ogólne"
 msgid "Printer name"
 msgstr "nazwa drukarki"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Wybierz poddrzewo do umieszczenia konta."
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "Szczegóły"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "Lokalizacja drukarki"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "Użytkownicy którzy mogą używać tej drukarki"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "Użytkownicy, którzy mogą administrować tą drukarką"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "Administratorzy"
 
@@ -2710,12 +2707,7 @@ msgstr "Szablon terminala"
 msgid "Terminal name"
 msgstr "Nazwa terminala"
 
-#: admin/systems/goto/terminal.tpl:31
-#, fuzzy
-msgid "Choose subtree to place terminal in"
-msgstr "Wybierz poddrzewo do umieszczenia konta."
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 #, fuzzy
 msgid "Inherit all"
 msgstr "Inicjały"
@@ -3003,7 +2995,7 @@ msgstr "Czas"
 msgid "MAC"
 msgstr "ACL"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 #, fuzzy
 msgid "Event"
@@ -3041,54 +3033,76 @@ msgstr "Login"
 msgid "GOto log view"
 msgstr "do folferu"
 
-#: addons/goto/class_gotomasses.inc:26
-#, fuzzy
-msgid "Deployment status"
-msgstr "Status systemu"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 #, fuzzy
 msgid "System deployment status"
 msgstr "Typ systemu"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:175
+#, fuzzy
+msgid "Waiting"
+msgstr "Ostrzeżenie"
+
+#: addons/goto/class_gotomasses.inc:181
+#, fuzzy
+msgid "Processed"
+msgstr "Właściwości"
+
+#: addons/goto/class_gotomasses.inc:196
+#, fuzzy
+msgid "Detection"
+msgstr "Sekcja"
+
+#: addons/goto/class_gotomasses.inc:204
+#, fuzzy
+msgid "in progress"
+msgstr "Właściwości"
+
+#: addons/goto/class_gotomasses.inc:228
 #, fuzzy
 msgid "Permission"
 msgstr "Uprawnienia"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-#, fuzzy
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, fuzzy, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "Nieznany wpis  '%s'!"
+
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
-"To menu umożliwia tworzenie, usuwanie oraz edycję ustawień repozytorium."
 
-#: addons/goto/class_gotomasses.inc:361
-#, fuzzy
-msgid "List of queued jobs"
-msgstr "Lista urządzeń"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
 #, fuzzy
-msgid "Resume"
-msgstr "Przeinstaluj"
+msgid "System deployment"
+msgstr "Zarządzanie systemem"
 
-#: addons/goto/class_gotomasses.inc:381
-#, fuzzy
-msgid "Pause"
-msgstr "Wklej"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:382
+#: addons/goto/deploy-list.xml:10
 #, fuzzy
-msgid "Abort"
-msgstr "Port"
+msgid "List of queued jobs"
+msgstr "Lista urządzeń"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3111,17 +3125,16 @@ msgstr "Port"
 msgid "Target"
 msgstr "Kodowanie"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "Zadanie"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 #, fuzzy
 msgid "Period"
 msgstr "Uprawnienia"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3140,8 +3153,7 @@ msgstr "Uprawnienia"
 msgid "Schedule"
 msgstr "PHP schedule it"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3160,85 +3172,58 @@ msgstr "PHP schedule it"
 msgid "Status"
 msgstr "Status"
 
-#: addons/goto/class_gotomasses.inc:443
-#, fuzzy
-msgid "Pause job"
-msgstr "Wklej"
-
-#: addons/goto/class_gotomasses.inc:450
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
 #, fuzzy
-msgid "Resume job"
-msgstr "Przeinstaluj"
+msgid "Lock"
+msgstr "Zablokowane"
 
-#: addons/goto/class_gotomasses.inc:457
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
 #, fuzzy
-msgid "Execute now"
-msgstr "Uruchom"
+msgid "Unlock"
+msgstr "Zablokowane"
 
-#: addons/goto/class_gotomasses.inc:464
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
 #, fuzzy
-msgid "View logs"
-msgstr "Dostępne aplikacje"
+msgid "Resume"
+msgstr "Przeinstaluj"
 
-#: addons/goto/class_gotomasses.inc:479
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
 #, fuzzy
-msgid "Abort job"
-msgstr "Inicjały"
+msgid "Pause"
+msgstr "Wklej"
 
-#: addons/goto/class_gotomasses.inc:525
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
 #, fuzzy
-msgid "Waiting"
-msgstr "Ostrzeżenie"
+msgid "Abort"
+msgstr "Port"
 
-#: addons/goto/class_gotomasses.inc:531
-#, fuzzy
-msgid "Processed"
-msgstr "Właściwości"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "Góra"
 
-#: addons/goto/class_gotomasses.inc:546
-#, fuzzy
-msgid "Detection"
-msgstr "Sekcja"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "W dół"
 
-#: addons/goto/class_gotomasses.inc:554
+#: addons/goto/deploy-list.xml:225
 #, fuzzy
-msgid "in progress"
+msgid "Process now"
 msgstr "Właściwości"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, fuzzy, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "Nieznany wpis  '%s'!"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
+#: addons/goto/deploy-list.xml:233
+#, fuzzy
+msgid "View logs"
+msgstr "Dostępne aplikacje"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, fuzzy, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "Nieznany wpis  '%s'!"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-#, fuzzy
-msgid "System deployment"
-msgstr "Zarządzanie systemem"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 #, fuzzy
 msgid "Available logs"
@@ -3254,12 +3239,6 @@ msgstr "Wybierz"
 msgid "No logs for this host available!"
 msgstr "Plik jest dostępny"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-#, fuzzy
-msgid "Lock"
-msgstr "Zablokowane"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3329,12 +3308,6 @@ msgstr "do folferu"
 msgid "Reload GOto settings"
 msgstr "Ustawienia Posix"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-#, fuzzy
-msgid "Unlock"
-msgstr "Zablokowane"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 #, fuzzy
@@ -3516,7 +3489,7 @@ msgstr "Pokaż serwery"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
 #, fuzzy
-msgid "List of systems"
+msgid "List of target systems"
 msgstr "Lista użytkowników"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3854,6 +3827,42 @@ msgstr "Ostatni skrypt"
 msgid "Script can be replaced by user"
 msgstr "Skrypt może być zmieniony przez użytkownika"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia konta."
+
+#, fuzzy
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia konta."
+
+#, fuzzy
+#~ msgid "Deployment status"
+#~ msgstr "Status systemu"
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "To menu umożliwia tworzenie, usuwanie oraz edycję ustawień repozytorium."
+
+#, fuzzy
+#~ msgid "Pause job"
+#~ msgstr "Wklej"
+
+#, fuzzy
+#~ msgid "Resume job"
+#~ msgstr "Przeinstaluj"
+
+#, fuzzy
+#~ msgid "Execute now"
+#~ msgstr "Uruchom"
+
+#, fuzzy
+#~ msgid "Abort job"
+#~ msgstr "Inicjały"
+
 #~ msgid "Submit"
 #~ msgstr "Wyślij"
 
@@ -5985,9 +5994,6 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
 #~ msgid "Go up one department"
 #~ msgstr "Idź jeden departament wyżej"
 
-#~ msgid "Up"
-#~ msgstr "Góra"
-
 #~ msgid "Go to users department"
 #~ msgstr "Przejdź do departamentu użytkowników"
 
@@ -6061,9 +6067,6 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
 #~ msgid "Groups"
 #~ msgstr "Grupy"
 
-#~ msgid "Down"
-#~ msgstr "W dół"
-
 #, fuzzy
 #~ msgid "No ACL settings for this category!"
 #~ msgstr "Brak ustawień ACL w tej kategorii"

diff --git a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
index b15179b9dffacb478a72438257d9929fcb0f71c0..23c060f29d6f5f8b6807a3e6e5dbe73bfd493a3c 100644 (file)
--- a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -32,74 +32,74 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "Общее"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Сервер NTP"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "Выберите сервер для синхронизации времени"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Режим"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "Выберите режим терминала"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Сервер системных журналов"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "Выберите сервер для ведения системных журналов"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Основной сервер"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "Выберите корневую файловую систему NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Сервер подкачки"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Выберите файловую систему NFS для файлов подкачки"
 
@@ -108,41 +108,41 @@ msgstr "Выберите файловую систему NFS для файлов
 msgid "Inherit all values to group members"
 msgstr "Список групп"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "Действие"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "Выполнить"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 #, fuzzy
 msgid "Activated"
 msgstr "Личный"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 #, fuzzy
 msgid "Local swap"
 msgstr "Местоположение"
@@ -161,7 +161,7 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -179,53 +179,55 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Искать в поддеревьях"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 #, fuzzy
 msgid "Event error"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Сменить пароль"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Выключить"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -247,15 +249,16 @@ msgid "Wake"
 msgstr "Вернуть в обычный режим"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -281,15 +284,15 @@ msgstr "Системные журналы"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -298,18 +301,18 @@ msgstr "Системные журналы"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 #, fuzzy
@@ -327,14 +330,14 @@ msgid "System group"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 #, fuzzy
 msgid "Action flag"
 msgstr "Действие"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 #, fuzzy
 msgid "Ntp server"
 msgstr "Сервер NTP"
@@ -377,43 +380,43 @@ msgid "Reset"
 msgstr "сброс"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 #, fuzzy
 msgid "Application settings"
 msgstr "Параметры приложения"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -474,8 +477,8 @@ msgstr "Показать приложения"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "Приложение"
 
@@ -514,13 +517,13 @@ msgid "Folder"
 msgstr "Фильтры"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 #, fuzzy
 msgid "Move up"
 msgstr "Режим"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 #, fuzzy
 msgid "Move down"
 msgstr "Домен"
@@ -535,9 +538,8 @@ msgstr "Домен"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -545,7 +547,7 @@ msgstr "Удалить"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Изменить"
@@ -598,7 +600,7 @@ msgid "List of devices"
 msgstr "Список пользователей"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -606,26 +608,26 @@ msgstr "Список пользователей"
 msgid "Device"
 msgstr "Устройства"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -638,7 +640,7 @@ msgstr "Описание"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "Действия"
 
@@ -646,7 +648,7 @@ msgstr "Действия"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "Создать"
 
@@ -661,72 +663,73 @@ msgid "Remove device"
 msgstr "Удалить изображение"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "Устройства"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "Ветка"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 #, fuzzy
 msgid "Device name"
 msgstr "Имя сервера"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 #, fuzzy
 msgid "Device type"
 msgstr "Имя сервера"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 #, fuzzy
 msgid "Choose the device type"
 msgstr "Выберите тип мыши"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "Serial number"
 msgstr "Телефонные номера"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 #, fuzzy
 msgid "(iSerial)"
 msgstr "терминалы"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 #, fuzzy
 msgid "Vendor-ID"
 msgstr "Идентификатор отправителя"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 #, fuzzy
 msgid "(idVendor)"
 msgstr "Идентификатор отправителя"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr ""
 
@@ -743,32 +746,33 @@ msgstr ""
 msgid "Filter"
 msgstr "Фильтры"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 #, fuzzy
 msgid "USB stick"
 msgstr "Состояние"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 #, fuzzy
 msgid "iSerial"
 msgstr "терминалы"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -778,21 +782,24 @@ msgstr "терминалы"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -802,17 +809,17 @@ msgstr "терминалы"
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Device generic"
 msgstr "Имя сервера"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Hotplug"
 msgstr "Дисковод"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -824,18 +831,18 @@ msgstr "Дисковод"
 msgid "Type"
 msgstr "Тип"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "терминалы"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 #, fuzzy
 msgid "Vendor"
 msgstr "Идентификатор отправителя"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 #, fuzzy
 msgid "Device ID"
 msgstr "Устройства"
@@ -906,7 +913,7 @@ msgid "Application parameter settings"
 msgstr "Приложение"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "Приложение"
 
@@ -915,7 +922,7 @@ msgid "Display name"
 msgstr "Отображаемое имя"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Имя приложения, которое будет показано пользователям (например, под "
@@ -930,16 +937,14 @@ msgid "Choose subtree to place application in"
 msgstr "Выберите ветку, куда нужно поместить приложение"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 #, fuzzy
 msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "Пиктограмма"
 
@@ -968,27 +973,27 @@ msgid "Options"
 msgstr "Параметры"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "Разрешено для выполнения только членам группы"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "Заменять настройки пользователя при запуске"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "Помещать пиктограмму на рабочие столы членов группы"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 #, fuzzy
 msgid "Place entry in members launch bar"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
@@ -1000,8 +1005,7 @@ msgid "Script"
 msgstr "Путь к сценариям"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -1040,47 +1044,47 @@ msgstr "приложения"
 msgid "no example"
 msgstr "не полный"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, fuzzy, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr "У вас недостаточно прав для удаления этого группового объекта!"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 #, fuzzy
 msgid "no read permission"
 msgstr "Права для членов группы"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 #, fuzzy
 msgid "cannot convert image"
 msgstr "Невозможно выбрать базу данных!"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, fuzzy, php-format
 msgid "cannot save image to '%s'"
 msgstr "Удалить"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 #, fuzzy
 msgid "Execute path"
 msgstr "Выполнить"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 #, fuzzy
 msgid "Application generic"
 msgstr "Приложение"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 #, fuzzy
 msgid "Script content"
 msgstr "Путь к сценариям"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 #, fuzzy
 msgid "Mime types"
 msgstr "Тип"
@@ -1104,7 +1108,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Введите корректный номер телефона!"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 #, fuzzy
 msgid "Mime group"
 msgstr "Основная группа"
@@ -1133,7 +1137,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 #, fuzzy
 msgid "File patterns"
 msgstr "Фильтры"
@@ -1196,22 +1200,22 @@ msgstr "Редактиовать объект"
 msgid "Remove mimetype"
 msgstr "Удалить изображение"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 #, fuzzy
 msgid "File pattern"
 msgstr "Фильтры"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 #, fuzzy
 msgid "Mime type generic"
 msgstr "Тип"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 #, fuzzy
 msgid "Left click action"
 msgstr "Создать приложения"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 #, fuzzy
 msgid "Embedded applications"
 msgstr "Используемые приложения"
@@ -1485,26 +1489,22 @@ msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "Имя рабочий станции"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "Местоположение"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "Выберите ветку для группы"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr ""
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 #, fuzzy
 msgid "Inherit all values from group"
 msgstr "Список групп"
@@ -1647,52 +1647,52 @@ msgstr "Объект группы"
 msgid "none"
 msgstr "нет"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 #, fuzzy
 msgid "printer"
 msgstr "принтеры"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 #, fuzzy
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
@@ -1701,77 +1701,77 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 #, fuzzy
 msgid "Remove printer extension"
 msgstr "Удалить параметры"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 #, fuzzy
 msgid "Not defined"
 msgstr "не определена"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 #, fuzzy
 msgid "Can't get ppd informations."
 msgstr "Общая информация о пользователе"
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 #, fuzzy
 msgid "terminal"
 msgstr "Терминалы"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
 msgstr "Рабочая станция"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 #, fuzzy
 msgid "Object is no printer!"
 msgstr "Сетевой принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "URL принтера"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Группа"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Пользователь"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 #, fuzzy
 msgid "Print generic"
 msgstr "Служба печати"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1779,45 +1779,45 @@ msgstr "Служба печати"
 msgid "Printer"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "printer user"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "Указанное имя уже используется."
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "Значение поля \"Файлы\" некорректно."
@@ -1933,7 +1933,7 @@ msgid "System informations"
 msgstr "Системная информация"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1941,8 +1941,8 @@ msgstr "Рабочая станция"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 #, fuzzy
 msgid "Terminal"
@@ -2256,57 +2256,59 @@ msgstr "Звук"
 msgid "GUI"
 msgstr "Графический интерфейс"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Создать телефонный аккаунт"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 #, fuzzy
 msgid "Software deployment"
 msgstr "Системы"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Имя рабочий станции"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #, fuzzy
 msgid "Goto mode"
 msgstr "в папку"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #, fuzzy
 msgid "Root password"
 msgstr "Изменить пароль"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Создать"
@@ -2373,7 +2375,7 @@ msgstr "Телефон"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "Драйвер"
 
@@ -2435,7 +2437,6 @@ msgstr "Выберите способ подключения к серверу 
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 #, fuzzy
 msgid "Reload"
 msgstr "чтение"
@@ -2696,17 +2697,17 @@ msgstr "Выберите тип мыши"
 msgid "set"
 msgstr "сброс"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Терминальный сервер"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Сервер системных журналов"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Почтовые настройки пользователя"
@@ -2720,38 +2721,34 @@ msgstr "Общее"
 msgid "Printer name"
 msgstr "Имя принтера"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "Выберите ветку для пользователя"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 #, fuzzy
 msgid "Printer location"
 msgstr "Настройки телефона"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 #, fuzzy
 msgid "Users which are allowed to use this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "Пользователи"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 #, fuzzy
 msgid "Users which are allowed to administrate this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 #, fuzzy
 msgid "Admins"
 msgstr "DN администратора"
@@ -2808,12 +2805,7 @@ msgstr "Шаблон терминала"
 msgid "Terminal name"
 msgstr "Терминал"
 
-#: admin/systems/goto/terminal.tpl:31
-#, fuzzy
-msgid "Choose subtree to place terminal in"
-msgstr "Выберите ветку для пользователя"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 #, fuzzy
 msgid "Inherit all"
 msgstr "Отчество"
@@ -3111,7 +3103,7 @@ msgstr "Таймаут (с)"
 msgid "MAC"
 msgstr "Доступ"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 #, fuzzy
 msgid "Event"
@@ -3150,56 +3142,76 @@ msgstr "Имя пользователя"
 msgid "GOto log view"
 msgstr "в папку"
 
-#: addons/goto/class_gotomasses.inc:26
-#, fuzzy
-msgid "Deployment status"
-msgstr "Состояние системы"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 #, fuzzy
 msgid "System deployment status"
 msgstr "Системы"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:175
+#, fuzzy
+msgid "Waiting"
+msgstr "Предупреждение"
+
+#: addons/goto/class_gotomasses.inc:181
+#, fuzzy
+msgid "Processed"
+msgstr "Свойства"
+
+#: addons/goto/class_gotomasses.inc:196
+#, fuzzy
+msgid "Detection"
+msgstr "Действие"
+
+#: addons/goto/class_gotomasses.inc:204
+#, fuzzy
+msgid "in progress"
+msgstr "Свойства"
+
+#: addons/goto/class_gotomasses.inc:228
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-#, fuzzy
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, fuzzy, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "состояние неизвестно"
+
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
-"отдельных систем. Вы можете только добавлять системы которые однажды уже "
-"были запущены."
 
-#: addons/goto/class_gotomasses.inc:361
-#, fuzzy
-msgid "List of queued jobs"
-msgstr "Список пользователей"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
 #, fuzzy
-msgid "Resume"
-msgstr "сброс"
+msgid "System deployment"
+msgstr "Управление системами"
 
-#: addons/goto/class_gotomasses.inc:381
-#, fuzzy
-msgid "Pause"
-msgstr "Дата"
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:382
+#: addons/goto/deploy-list.xml:10
 #, fuzzy
-msgid "Abort"
-msgstr "Ð\9fоÑ\80Ñ\82"
+msgid "List of queued jobs"
+msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3222,17 +3234,16 @@ msgstr "Порт"
 msgid "Target"
 msgstr "сброс"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 #, fuzzy
 msgid "Period"
 msgstr "Права для членов группы"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3251,8 +3262,7 @@ msgstr "Права для членов группы"
 msgid "Schedule"
 msgstr "Учетная запись Groupware"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3271,85 +3281,57 @@ msgstr "Учетная запись Groupware"
 msgid "Status"
 msgstr "Состояние"
 
-#: addons/goto/class_gotomasses.inc:443
-#, fuzzy
-msgid "Pause job"
-msgstr "Дата"
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
+msgid "Lock"
+msgstr ""
+
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
+msgid "Unlock"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:450
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
 #, fuzzy
-msgid "Resume job"
+msgid "Resume"
 msgstr "сброс"
 
-#: addons/goto/class_gotomasses.inc:457
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
 #, fuzzy
-msgid "Execute now"
-msgstr "Ð\92Ñ\8bполниÑ\82Ñ\8c"
+msgid "Pause"
+msgstr "Ð\94аÑ\82а"
 
-#: addons/goto/class_gotomasses.inc:464
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
 #, fuzzy
-msgid "View logs"
-msgstr "Ð\94оÑ\81Ñ\82Ñ\83пнÑ\8bе пÑ\80иложениÑ\8f"
+msgid "Abort"
+msgstr "Ð\9fоÑ\80Ñ\82"
 
-#: addons/goto/class_gotomasses.inc:479
-#, fuzzy
-msgid "Abort job"
-msgstr "Отчество"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:525
+#: addons/goto/deploy-list.xml:201
 #, fuzzy
-msgid "Waiting"
-msgstr "Ð\9fÑ\80едÑ\83пÑ\80еждение"
+msgid "Down"
+msgstr "Ð\94омен"
 
-#: addons/goto/class_gotomasses.inc:531
+#: addons/goto/deploy-list.xml:225
 #, fuzzy
-msgid "Processed"
+msgid "Process now"
 msgstr "Свойства"
 
-#: addons/goto/class_gotomasses.inc:546
-#, fuzzy
-msgid "Detection"
-msgstr "Действие"
-
-#: addons/goto/class_gotomasses.inc:554
+#: addons/goto/deploy-list.xml:233
 #, fuzzy
-msgid "in progress"
-msgstr "Свойства"
-
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, fuzzy, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "состояние неизвестно"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
+msgid "View logs"
+msgstr "Доступные приложения"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, fuzzy, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "состояние неизвестно"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-#, fuzzy
-msgid "System deployment"
-msgstr "Управление системами"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 #, fuzzy
 msgid "Available logs"
@@ -3364,11 +3346,6 @@ msgstr "Удалить"
 msgid "No logs for this host available!"
 msgstr ""
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-msgid "Lock"
-msgstr ""
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3438,11 +3415,6 @@ msgstr "в папку"
 msgid "Reload GOto settings"
 msgstr "Атрибуты UNIX"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-msgid "Unlock"
-msgstr ""
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 #, fuzzy
@@ -3625,7 +3597,7 @@ msgstr "Показать серверы"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
 #, fuzzy
-msgid "List of systems"
+msgid "List of target systems"
 msgstr "Список пользователей"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3991,6 +3963,44 @@ msgstr "Изменить сертификаты"
 msgid "Script can be replaced by user"
 msgstr ""
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Выберите ветку для группы"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Выберите ветку для пользователя"
+
+#, fuzzy
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "Выберите ветку для пользователя"
+
+#, fuzzy
+#~ msgid "Deployment status"
+#~ msgstr "Состояние системы"
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять свойства "
+#~ "отдельных систем. Вы можете только добавлять системы которые однажды уже "
+#~ "были запущены."
+
+#, fuzzy
+#~ msgid "Pause job"
+#~ msgstr "Дата"
+
+#, fuzzy
+#~ msgid "Resume job"
+#~ msgstr "сброс"
+
+#, fuzzy
+#~ msgid "Execute now"
+#~ msgstr "Выполнить"
+
+#, fuzzy
+#~ msgid "Abort job"
+#~ msgstr "Отчество"
+
 #, fuzzy
 #~ msgid "Add user"
 #~ msgstr "Пользователи домена"
@@ -6008,10 +6018,6 @@ msgstr ""
 #~ msgid "Groups"
 #~ msgstr "Группы"
 
-#, fuzzy
-#~ msgid "Down"
-#~ msgstr "Домен"
-
 #, fuzzy
 #~ msgid "No ACL settings for this category!"
 #~ msgstr "Описание группы"

diff --git a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
index 3f42c2f9e9e0569f5c896636fe1adaf5bbaf90ea..2e9128ae16e20bcdf24ea36d51b4c8da049038ec 100644 (file)
--- a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-02-01 15:16+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -36,74 +36,74 @@ msgstr ""
 "被分配到该对象组的对象继承。"
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:251
-#: admin/applications/class_applicationGeneric.inc:597
+#: admin/devices/class_deviceGeneric.inc:263
+#: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
-#: admin/mimetypes/class_mimetypeGeneric.inc:715
-#: admin/systems/goto/class_printGeneric.inc:1015
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/mimetypes/class_mimetypeGeneric.inc:683
+#: admin/systems/goto/class_printGeneric.inc:989
+#: admin/systems/goto/class_workstationGeneric.inc:679
 msgid "Generic"
 msgstr "通用配置"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
-#: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:490
-#: admin/systems/goto/class_terminalGeneric.inc:482
-#: admin/systems/goto/terminal.tpl:84
+#: admin/systems/goto/workstation.tpl:90
+#: admin/systems/goto/class_workstationGeneric.inc:470
+#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "NTP 服务器"
 
-#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:98
-#: admin/systems/goto/terminal.tpl:87
+#: admin/ogroups/goto/termgroup.tpl:17 admin/systems/goto/workstation.tpl:93
+#: admin/systems/goto/terminal.tpl:82
 msgid "Choose server to use for synchronizing time"
 msgstr "选择要用于同步时间的服务器"
 
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
-#: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:702
-#: admin/systems/goto/terminal.tpl:47
+#: admin/systems/goto/workstation.tpl:50
+#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "模式"
 
-#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:58
-#: admin/systems/goto/terminal.tpl:50
+#: admin/ogroups/goto/termgroup.tpl:50 admin/systems/goto/workstation.tpl:53
+#: admin/systems/goto/terminal.tpl:45
 msgid "Select terminal mode"
 msgstr "选择终端类型"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:713
-#: admin/systems/goto/terminal.tpl:57
+#: admin/systems/goto/workstation.tpl:60
+#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "日志服务器"
 
-#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:68
-#: admin/systems/goto/terminal.tpl:60
+#: admin/ogroups/goto/termgroup.tpl:61 admin/systems/goto/workstation.tpl:63
+#: admin/systems/goto/terminal.tpl:55
 msgid "Choose server to use for logging"
 msgstr "限制记录日志的服务器"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:705
-#: admin/systems/goto/terminal.tpl:117
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "根服务器"
 
-#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:120
+#: admin/ogroups/goto/termgroup.tpl:72 admin/systems/goto/terminal.tpl:115
 msgid "Select NFS root filesystem to use"
 msgstr "选择要用的 NFS 根文件系统。"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:706
-#: admin/systems/goto/terminal.tpl:131
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "交换服务器"
 
-#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:134
+#: admin/ogroups/goto/termgroup.tpl:82 admin/systems/goto/terminal.tpl:129
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "选择放置交换文件的 NFS 文件系统"
 
@@ -112,40 +112,40 @@ msgstr "选择放置交换文件的 NFS 文件系统"
 msgid "Inherit all values to group members"
 msgstr "组列表"
 
-#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:130
-#: admin/systems/goto/terminal.tpl:155 addons/goto/class_gotomasses.inc:417
+#: admin/ogroups/goto/termgroup.tpl:113 admin/systems/goto/workstation.tpl:125
+#: admin/systems/goto/terminal.tpl:150
 msgid "Action"
 msgstr "行动"
 
-#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:137
-#: admin/systems/goto/terminal.tpl:160
+#: admin/ogroups/goto/termgroup.tpl:118 admin/systems/goto/workstation.tpl:132
+#: admin/systems/goto/terminal.tpl:155
 msgid "Select action to execute for this terminal"
 msgstr "选择这个终端要执行的动作"
 
 #: admin/ogroups/goto/termgroup.tpl:126 admin/applications/generic.tpl:24
-#: admin/applications/class_applicationGeneric.inc:438
-#: admin/applications/class_applicationGeneric.inc:609
-#: admin/systems/goto/workstation.tpl:146
-#: admin/systems/goto/workstation.tpl:150 admin/systems/goto/terminal.tpl:168
-#: addons/goto/class_gotomasses.inc:383
+#: admin/applications/class_applicationGeneric.inc:408
+#: admin/applications/class_applicationGeneric.inc:579
+#: admin/systems/goto/workstation.tpl:141
+#: admin/systems/goto/workstation.tpl:145 admin/systems/goto/terminal.tpl:163
+#: addons/goto/deploy-list.xml:181
 msgid "Execute"
 msgstr "执行"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:124
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:125
 msgid "Activated"
 msgstr "活动"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:123
-#: addons/goto/class_gotomasses.inc:542
+#: admin/systems/goto/class_workstationGeneric.inc:141
+#: admin/systems/goto/class_terminalGeneric.inc:124
+#: addons/goto/class_gotomasses.inc:192
 msgid "Locked"
 msgstr "锁定"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:283
+#: admin/systems/goto/class_terminalGeneric.inc:259
 #, fuzzy
 msgid "Local swap"
 msgstr "位置名称"
@@ -164,7 +164,7 @@ msgstr "位置名称"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:155
+#: admin/systems/goto/class_workstationGeneric.inc:156
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -182,53 +182,55 @@ msgstr "位置名称"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:289
-#: admin/systems/goto/class_terminalGeneric.inc:301
+#: admin/systems/goto/class_terminalGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_terminalGeneric.inc:277
 msgid "inherited"
 msgstr "继承"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:213
-#: admin/systems/goto/class_workstationGeneric.inc:636
+#: admin/systems/goto/class_workstationGeneric.inc:220
+#: admin/systems/goto/class_workstationGeneric.inc:616
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:189
-#: admin/systems/goto/class_terminalGeneric.inc:627
-#: addons/goto/class_gotomasses.inc:328
+#: admin/systems/goto/class_terminalGeneric.inc:196
+#: admin/systems/goto/class_terminalGeneric.inc:607
+#: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "在子树中查找"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:193
+#: admin/systems/goto/class_workstationGeneric.inc:224
+#: admin/systems/goto/class_terminalGeneric.inc:200
 #, fuzzy
 msgid "Event error"
 msgstr "错误"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:218
-#: admin/systems/goto/class_terminalGeneric.inc:194
+#: admin/systems/goto/class_workstationGeneric.inc:225
+#: admin/systems/goto/class_terminalGeneric.inc:201
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "不允许修改口令"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:243
+#: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "关闭"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_terminalGeneric.inc:268
+#: admin/systems/goto/class_workstationGeneric.inc:275
+#: admin/systems/goto/class_terminalGeneric.inc:244
+#: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -248,15 +250,16 @@ msgid "Wake"
 msgstr "唤醒"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:301
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_workstationGeneric.inc:285
+#: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "重新安装"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:302
+#: admin/systems/goto/class_workstationGeneric.inc:278
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -279,15 +282,15 @@ msgstr "系统分析"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:196
+#: admin/devices/class_deviceGeneric.inc:208
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
-#: admin/applications/class_applicationGeneric.inc:271
-#: admin/applications/class_applicationGeneric.inc:285
-#: admin/applications/class_applicationGeneric.inc:515
-#: admin/mimetypes/class_mimetypeGeneric.inc:494
-#: admin/mimetypes/class_mimetypeGeneric.inc:506
-#: admin/mimetypes/class_mimetypeGeneric.inc:521
+#: admin/applications/class_applicationGeneric.inc:241
+#: admin/applications/class_applicationGeneric.inc:255
+#: admin/applications/class_applicationGeneric.inc:485
+#: admin/mimetypes/class_mimetypeGeneric.inc:462
+#: admin/mimetypes/class_mimetypeGeneric.inc:474
+#: admin/mimetypes/class_mimetypeGeneric.inc:489
 #: admin/systems/services/kiosk/class_goKioskService.inc:249
 #: admin/systems/services/ldap/class_goLdapServer.inc:117
 #: admin/systems/services/ntp/class_goNtpServer.inc:98
@@ -296,18 +299,18 @@ msgstr "系统分析"
 #: admin/systems/services/shares/class_goShareServer.inc:285
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
-#: admin/systems/goto/class_printGeneric.inc:687
-#: admin/systems/goto/class_printGeneric.inc:980
+#: admin/systems/goto/class_printGeneric.inc:657
+#: admin/systems/goto/class_printGeneric.inc:954
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:365
-#: admin/systems/goto/class_workstationGeneric.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:614
+#: admin/systems/goto/class_workstationGeneric.inc:342
+#: admin/systems/goto/class_workstationGeneric.inc:577
+#: admin/systems/goto/class_workstationGeneric.inc:594
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:355
-#: admin/systems/goto/class_terminalGeneric.inc:613
+#: admin/systems/goto/class_terminalGeneric.inc:332
+#: admin/systems/goto/class_terminalGeneric.inc:593
 #: personal/environment/class_environment.inc:1063
 #: personal/environment/class_environment.inc:1320
 #, fuzzy
@@ -324,14 +327,14 @@ msgid "System group"
 msgstr "信赖的系统"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:717
-#: admin/systems/goto/class_terminalGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:697
+#: admin/systems/goto/class_terminalGeneric.inc:691
 #, fuzzy
 msgid "Action flag"
 msgstr "行动"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:714
+#: admin/systems/goto/class_workstationGeneric.inc:694
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP 服务器"
@@ -373,42 +376,42 @@ msgid "Reset"
 msgstr "设置"
 
 #: admin/groups/apps/edit_entry.tpl:40
-#: admin/applications/class_applicationGeneric.inc:557
+#: admin/applications/class_applicationGeneric.inc:527
 msgid "Application settings"
 msgstr "应用程序设置"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:90
-#: admin/devices/class_deviceGeneric.inc:114
-#: admin/devices/class_deviceGeneric.inc:260
+#: admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:121
+#: admin/devices/class_deviceGeneric.inc:272
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
 #: admin/applications/application-list-release.xml:41
-#: admin/applications/class_applicationGeneric.inc:430
-#: admin/applications/class_applicationGeneric.inc:434
-#: admin/applications/class_applicationGeneric.inc:606
-#: admin/applications/class_applicationGeneric.inc:610
+#: admin/applications/class_applicationGeneric.inc:400
+#: admin/applications/class_applicationGeneric.inc:404
+#: admin/applications/class_applicationGeneric.inc:576
+#: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
 #: admin/mimetypes/mimetype-list.xml:41
-#: admin/mimetypes/class_mimetypeGeneric.inc:532
-#: admin/mimetypes/class_mimetypeGeneric.inc:724
+#: admin/mimetypes/class_mimetypeGeneric.inc:500
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
-#: admin/systems/goto/class_printGeneric.inc:760
-#: admin/systems/goto/class_printGeneric.inc:765
-#: admin/systems/goto/class_printGeneric.inc:784
-#: admin/systems/goto/class_printGeneric.inc:1024
+#: admin/systems/goto/class_printGeneric.inc:734
+#: admin/systems/goto/class_printGeneric.inc:739
+#: admin/systems/goto/class_printGeneric.inc:758
+#: admin/systems/goto/class_printGeneric.inc:998
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:457
-#: admin/systems/goto/class_workstationGeneric.inc:462
-#: admin/systems/goto/class_workstationGeneric.inc:480
-#: admin/systems/goto/class_terminalGeneric.inc:448
-#: admin/systems/goto/class_terminalGeneric.inc:453
-#: admin/systems/goto/class_terminalGeneric.inc:472
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:437
+#: admin/systems/goto/class_workstationGeneric.inc:442
+#: admin/systems/goto/class_workstationGeneric.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:428
+#: admin/systems/goto/class_terminalGeneric.inc:433
+#: admin/systems/goto/class_terminalGeneric.inc:452
+#: admin/systems/goto/class_terminalGeneric.inc:678
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
@@ -466,8 +469,8 @@ msgstr "应用程序"
 #: admin/applications/application-list.xml:74
 #: admin/applications/application-list-release.xml:15
 #: admin/applications/application-list-release.xml:74
-#: admin/applications/class_applicationGeneric.inc:603
-#: admin/mimetypes/class_mimetypeGeneric.inc:728
+#: admin/applications/class_applicationGeneric.inc:573
+#: admin/mimetypes/class_mimetypeGeneric.inc:696
 msgid "Application"
 msgstr "应用程序"
 
@@ -505,12 +508,12 @@ msgid "Folder"
 msgstr "过滤器"
 
 #: admin/groups/apps/app_list.tpl:82 admin/groups/apps/app_list.tpl:103
-#: admin/groups/apps/app_list.tpl:128 addons/goto/class_gotomasses.inc:434
+#: admin/groups/apps/app_list.tpl:128
 msgid "Move up"
 msgstr "向上移动"
 
 #: admin/groups/apps/app_list.tpl:84 admin/groups/apps/app_list.tpl:105
-#: admin/groups/apps/app_list.tpl:130 addons/goto/class_gotomasses.inc:436
+#: admin/groups/apps/app_list.tpl:130
 msgid "Move down"
 msgstr "向下移动"
 
@@ -524,9 +527,8 @@ msgstr "向下移动"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:80 addons/goto/class_gotomasses.inc:269
-#: addons/goto/class_gotomasses.inc:376 addons/goto/class_gotomasses.inc:486
-#: addons/goto/class_gotomasses.inc:490
+#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
 msgid "Remove"
@@ -534,7 +536,7 @@ msgstr "删除"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:77 addons/goto/class_gotomasses.inc:471
+#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "编辑"
@@ -582,33 +584,33 @@ msgid "List of devices"
 msgstr "设备列表"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_deviceGeneric.inc:171
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
 msgid "Device"
 msgstr "设备"
 
-#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
-#: admin/devices/class_deviceGeneric.inc:93
-#: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
+#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
-#: admin/applications/class_applicationGeneric.inc:608
+#: admin/applications/class_applicationGeneric.inc:578
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
 #: admin/mimetypes/mimetype-list-release.xml:49
 #: admin/mimetypes/mimetype-list.xml:49
-#: admin/mimetypes/class_mimetypeGeneric.inc:726
+#: admin/mimetypes/class_mimetypeGeneric.inc:694
 #: admin/systems/services/shares/class_goShareServer.inc:424
 #: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1026
-#: admin/systems/goto/class_workstationGeneric.inc:709
-#: admin/systems/goto/class_terminalGeneric.inc:699
+#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_workstationGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:679
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:932
+#: addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -621,7 +623,7 @@ msgstr "描述"
 #: admin/devices/device-list.xml:57 admin/applications/application-list.xml:57
 #: admin/applications/application-list-release.xml:57
 #: admin/mimetypes/mimetype-list-release.xml:57
-#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/deploy-list.xml:67
 msgid "Actions"
 msgstr "动作"
 
@@ -629,7 +631,7 @@ msgstr "动作"
 #: admin/applications/application-list-release.xml:68
 #: admin/mimetypes/mimetype-list-release.xml:68
 #: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
-#: addons/goto/class_gotomasses.inc:366
+#: addons/goto/deploy-list.xml:78
 msgid "Create"
 msgstr "创建"
 
@@ -644,67 +646,68 @@ msgid "Remove device"
 msgstr "删除图片"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Devices"
 msgstr "设备"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:261
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
-#: admin/applications/class_applicationGeneric.inc:607
+#: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
 #: admin/mimetypes/mimetype-list.tpl:13
-#: admin/mimetypes/class_mimetypeGeneric.inc:727
+#: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:1025
-#: admin/systems/goto/class_workstationGeneric.inc:711
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:999
+#: admin/systems/goto/class_workstationGeneric.inc:691
+#: admin/systems/goto/class_terminalGeneric.inc:680
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
 #: addons/goto/events/eventTargetUser-list.tpl:13
+#: addons/goto/deploy-list.tpl:13
 #: personal/environment/printerSelect/selectPrinter-list.tpl:13
 #: personal/environment/hotplugSelect/selectHotplug-list.tpl:13
 msgid "Base"
 msgstr "位置"
 
-#: admin/devices/deviceGeneric.tpl:20 admin/devices/paste_deviceGeneric.tpl:9
+#: admin/devices/deviceGeneric.tpl:18 admin/devices/paste_deviceGeneric.tpl:9
 msgid "Device name"
 msgstr "设备名称"
 
-#: admin/devices/deviceGeneric.tpl:38
+#: admin/devices/deviceGeneric.tpl:36
 #, fuzzy
 msgid "Device type"
 msgstr "设备名称"
 
-#: admin/devices/deviceGeneric.tpl:42
+#: admin/devices/deviceGeneric.tpl:40
 #, fuzzy
 msgid "Choose the device type"
 msgstr "选择一个电话类型"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "Serial number"
 msgstr "系列号"
 
-#: admin/devices/deviceGeneric.tpl:53
+#: admin/devices/deviceGeneric.tpl:51
 msgid "(iSerial)"
 msgstr "(iSerial)"
 
-#: admin/devices/deviceGeneric.tpl:63
-#: admin/devices/class_deviceGeneric.inc:106
+#: admin/devices/deviceGeneric.tpl:61
+#: admin/devices/class_deviceGeneric.inc:113
 msgid "Vendor-ID"
 msgstr "供应商-ID"
 
-#: admin/devices/deviceGeneric.tpl:63
+#: admin/devices/deviceGeneric.tpl:61
 msgid "(idVendor)"
 msgstr "(idVendor)"
 
-#: admin/devices/deviceGeneric.tpl:72
-#: admin/devices/class_deviceGeneric.inc:103
+#: admin/devices/deviceGeneric.tpl:70
+#: admin/devices/class_deviceGeneric.inc:110
 msgid "Product-ID"
 msgstr "产品-ID"
 
-#: admin/devices/deviceGeneric.tpl:72
+#: admin/devices/deviceGeneric.tpl:70
 msgid "(idProduct)"
 msgstr "(idProduct)"
 
@@ -721,32 +724,33 @@ msgstr "(idProduct)"
 msgid "Filter"
 msgstr "过滤器"
 
-#: admin/devices/class_deviceGeneric.inc:29
+#: admin/devices/class_deviceGeneric.inc:30
 msgid "Digital camera"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:30
+#: admin/devices/class_deviceGeneric.inc:31
 #, fuzzy
 msgid "USB stick"
 msgstr "置顶"
 
-#: admin/devices/class_deviceGeneric.inc:31
+#: admin/devices/class_deviceGeneric.inc:32
 msgid "CD/DVD drive"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:98
-#: admin/devices/class_deviceGeneric.inc:100
+#: admin/devices/class_deviceGeneric.inc:105
+#: admin/devices/class_deviceGeneric.inc:107
 #, fuzzy
 msgid "iSerial"
 msgstr "(iSerial)"
 
-#: admin/devices/class_deviceGeneric.inc:159
-#: admin/applications/class_applicationGeneric.inc:264
-#: admin/applications/class_applicationGeneric.inc:338
-#: admin/applications/class_applicationGeneric.inc:370
-#: admin/applications/class_applicationGeneric.inc:375
-#: admin/applications/class_applicationGeneric.inc:380
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/devices/class_deviceGeneric.inc:145
+#: admin/devices/class_deviceGeneric.inc:171
+#: admin/applications/class_applicationGeneric.inc:234
+#: admin/applications/class_applicationGeneric.inc:308
+#: admin/applications/class_applicationGeneric.inc:340
+#: admin/applications/class_applicationGeneric.inc:345
+#: admin/applications/class_applicationGeneric.inc:350
+#: admin/applications/class_applicationGeneric.inc:354
 #: admin/systems/services/kiosk/class_goKioskService.inc:69
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
 #: admin/systems/services/kiosk/class_goKioskService.inc:161
@@ -756,21 +760,24 @@ msgstr "(iSerial)"
 #: admin/systems/services/shares/class_goShareServer.inc:257
 #: admin/systems/services/nfs/class_servNfs.inc:43
 #: admin/systems/services/nfs/class_servNfs.inc:46
-#: admin/systems/goto/class_printGeneric.inc:490
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
-#: admin/systems/goto/class_printGeneric.inc:1103
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:460
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
+#: admin/systems/goto/class_printGeneric.inc:700
+#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1088
 #: admin/systems/goto/class_terminalStartup.inc:223
+#: admin/systems/goto/class_workstationGeneric.inc:393
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
+#: admin/systems/goto/class_terminalGeneric.inc:379
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
-#: addons/goto/class_gotomasses.inc:174 addons/goto/class_gotomasses.inc:528
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:706
-#: addons/goto/class_gotomasses.inc:750 addons/goto/class_gotomasses.inc:754
-#: addons/goto/class_gotomasses.inc:790 addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
+#: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
+#: addons/goto/class_filterGotoEvents.inc:18
 #: personal/environment/class_environment.inc:591
 #: personal/environment/class_environment.inc:673
 #: personal/environment/class_environment.inc:675
@@ -780,17 +787,17 @@ msgstr "(iSerial)"
 msgid "Error"
 msgstr "错误"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Device generic"
 msgstr "服务器名称"
 
-#: admin/devices/class_deviceGeneric.inc:252
+#: admin/devices/class_deviceGeneric.inc:264
 #, fuzzy
 msgid "Hotplug"
 msgstr "热插拔设备"
 
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:275
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -802,18 +809,18 @@ msgstr "热插拔设备"
 msgid "Type"
 msgstr "类型"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:276
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "(iSerial)"
 
-#: admin/devices/class_deviceGeneric.inc:265
+#: admin/devices/class_deviceGeneric.inc:277
 #, fuzzy
 msgid "Vendor"
 msgstr "供应商-ID"
 
-#: admin/devices/class_deviceGeneric.inc:266
+#: admin/devices/class_deviceGeneric.inc:278
 #, fuzzy
 msgid "Device ID"
 msgstr "设备"
@@ -880,7 +887,7 @@ msgid "Application parameter settings"
 msgstr "应用程序设置"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_applicationGeneric.inc:561
+#: admin/applications/class_applicationGeneric.inc:531
 msgid "Application name"
 msgstr "应用程序名称"
 
@@ -889,7 +896,7 @@ msgid "Display name"
 msgstr "显示名称"
 
 #: admin/applications/generic.tpl:19
-#: admin/applications/class_applicationGeneric.inc:566
+#: admin/applications/class_applicationGeneric.inc:536
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "要显示的应用程序名称（在图标下）"
 
@@ -902,15 +909,13 @@ msgid "Choose subtree to place application in"
 msgstr "选择放置应用程序的子树"
 
 #: admin/applications/generic.tpl:52 admin/mimetypes/generic.tpl:53
-#: admin/systems/goto/workstation.tpl:43 admin/systems/goto/printer.tpl:35
-#: admin/systems/goto/terminal.tpl:36
 msgid "Select a base"
 msgstr "选择一个位置"
 
 #: admin/applications/generic.tpl:66
-#: admin/applications/class_applicationGeneric.inc:611
+#: admin/applications/class_applicationGeneric.inc:581
 #: admin/mimetypes/generic.tpl:67
-#: admin/mimetypes/class_mimetypeGeneric.inc:730
+#: admin/mimetypes/class_mimetypeGeneric.inc:698
 msgid "Icon"
 msgstr "图标"
 
@@ -939,27 +944,27 @@ msgid "Options"
 msgstr "选项"
 
 #: admin/applications/generic.tpl:103
-#: admin/applications/class_applicationGeneric.inc:614
+#: admin/applications/class_applicationGeneric.inc:584
 msgid "Only executable for members"
 msgstr "只允许成员执行"
 
 #: admin/applications/generic.tpl:108
-#: admin/applications/class_applicationGeneric.inc:618
+#: admin/applications/class_applicationGeneric.inc:588
 msgid "Replace user configuration on startup"
 msgstr "替换启动时用户配置"
 
 #: admin/applications/generic.tpl:114
-#: admin/applications/class_applicationGeneric.inc:615
+#: admin/applications/class_applicationGeneric.inc:585
 msgid "Place icon on members desktop"
 msgstr "在成员桌面放置图标"
 
 #: admin/applications/generic.tpl:119
-#: admin/applications/class_applicationGeneric.inc:617
+#: admin/applications/class_applicationGeneric.inc:587
 msgid "Place entry in members startmenu"
 msgstr "替换成员启动菜单条目"
 
 #: admin/applications/generic.tpl:124
-#: admin/applications/class_applicationGeneric.inc:616
+#: admin/applications/class_applicationGeneric.inc:586
 msgid "Place entry in members launch bar"
 msgstr "在成员的启动条放置条目"
 
@@ -969,8 +974,7 @@ msgid "Script"
 msgstr "脚本"
 
 #: admin/applications/generic.tpl:139 addons/goto/goto_import_file.tpl:84
-#: addons/goto/class_gotomasses.inc:375
-#: addons/goto/class_goto_import_file.inc:29
+#: addons/goto/deploy-list.xml:138 addons/goto/class_goto_import_file.inc:29
 #: addons/goto/class_goto_import_file.inc:89
 #: addons/goto/class_goto_import_file.inc:131
 #: personal/environment/logonManagement.tpl:65
@@ -1007,47 +1011,47 @@ msgstr "应用程序"
 msgid "no example"
 msgstr "没有示例"
 
-#: admin/applications/class_applicationGeneric.inc:264
+#: admin/applications/class_applicationGeneric.inc:234
 #, fuzzy, php-format
 msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr "您不能删除 asterisk 数据库扩展，它仍被这些对象 '%s' 使用。"
 
-#: admin/applications/class_applicationGeneric.inc:370
+#: admin/applications/class_applicationGeneric.inc:340
 #, fuzzy
 msgid "no read permission"
 msgstr "允许"
 
-#: admin/applications/class_applicationGeneric.inc:375
+#: admin/applications/class_applicationGeneric.inc:345
 msgid "cannot resize image"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:380
+#: admin/applications/class_applicationGeneric.inc:350
 #, fuzzy
 msgid "cannot convert image"
 msgstr "无法打开指定证书！"
 
-#: admin/applications/class_applicationGeneric.inc:384
+#: admin/applications/class_applicationGeneric.inc:354
 #, fuzzy, php-format
 msgid "cannot save image to '%s'"
 msgstr "无法保存文件 '%s'。"
 
-#: admin/applications/class_applicationGeneric.inc:413
+#: admin/applications/class_applicationGeneric.inc:383
 #, fuzzy
 msgid "Execute path"
 msgstr "执行"
 
-#: admin/applications/class_applicationGeneric.inc:598
+#: admin/applications/class_applicationGeneric.inc:568
 #, fuzzy
 msgid "Application generic"
 msgstr "应用程序名称"
 
-#: admin/applications/class_applicationGeneric.inc:612
+#: admin/applications/class_applicationGeneric.inc:582
 #, fuzzy
 msgid "Script content"
 msgstr "变量内容"
 
 #: admin/mimetypes/class_mimetypeManagement.inc:25
-#: admin/mimetypes/class_mimetypeGeneric.inc:721
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
 #, fuzzy
 msgid "Mime types"
 msgstr "Mime-type"
@@ -1071,7 +1075,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "请为这个会议输入一个名称。"
 
 #: admin/mimetypes/generic.tpl:22
-#: admin/mimetypes/class_mimetypeGeneric.inc:725
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
 #, fuzzy
 msgid "Mime group"
 msgstr "主要用户组"
@@ -1100,7 +1104,7 @@ msgid "Left click"
 msgstr ""
 
 #: admin/mimetypes/generic.tpl:104
-#: admin/mimetypes/class_mimetypeGeneric.inc:731
+#: admin/mimetypes/class_mimetypeGeneric.inc:699
 #, fuzzy
 msgid "File patterns"
 msgstr "过滤器"
@@ -1163,22 +1167,22 @@ msgstr "编辑这条记录"
 msgid "Remove mimetype"
 msgstr "删除图片"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:535
+#: admin/mimetypes/class_mimetypeGeneric.inc:503
 #, fuzzy
 msgid "File pattern"
 msgstr "过滤器"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:716
+#: admin/mimetypes/class_mimetypeGeneric.inc:684
 #, fuzzy
 msgid "Mime type generic"
 msgstr "Mime-type"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:729
+#: admin/mimetypes/class_mimetypeGeneric.inc:697
 #, fuzzy
 msgid "Left click action"
 msgstr "创建应用程序"
 
-#: admin/mimetypes/class_mimetypeGeneric.inc:732
+#: admin/mimetypes/class_mimetypeGeneric.inc:700
 #, fuzzy
 msgid "Embedded applications"
 msgstr "使用的应用程序"
@@ -1441,26 +1445,22 @@ msgid "Workstation template"
 msgstr "工作站模板"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:708
+#: admin/systems/goto/class_workstationGeneric.inc:688
 msgid "Workstation name"
 msgstr "工作站名称"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1027
-#: admin/systems/goto/class_workstationGeneric.inc:710
+#: admin/systems/goto/class_printGeneric.inc:1001
+#: admin/systems/goto/class_workstationGeneric.inc:690
 msgid "Location"
 msgstr "位置"
 
-#: admin/systems/goto/workstation.tpl:38
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
-
-#: admin/systems/goto/workstation.tpl:87 admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/terminal.tpl:76 admin/systems/goto/terminal.tpl:79
+#: admin/systems/goto/workstation.tpl:82 admin/systems/goto/workstation.tpl:85
+#: admin/systems/goto/terminal.tpl:71 admin/systems/goto/terminal.tpl:74
 msgid "Inherit time server attributes"
 msgstr "继承时间服务器属性"
 
-#: admin/systems/goto/workstation.tpl:160
+#: admin/systems/goto/workstation.tpl:155
 #, fuzzy
 msgid "Inherit all values from group"
 msgstr "组列表"
@@ -1595,53 +1595,53 @@ msgstr "对象组"
 msgid "none"
 msgstr "无"
 
-#: admin/systems/goto/class_printGeneric.inc:113
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:114
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
 
-#: admin/systems/goto/class_printGeneric.inc:113
+#: admin/systems/goto/class_printGeneric.inc:114
 #, fuzzy, php-format
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr "无法从对象 dn 中提取一个有效的 base，设置 base 为 '%s'。"
 
-#: admin/systems/goto/class_printGeneric.inc:290
-#: admin/systems/goto/class_printGeneric.inc:298
-#: admin/systems/goto/class_printGeneric.inc:303
-#: admin/systems/goto/class_printGeneric.inc:352
-#: admin/systems/goto/class_printGeneric.inc:368
-#: admin/systems/goto/class_printGeneric.inc:371
+#: admin/systems/goto/class_printGeneric.inc:297
+#: admin/systems/goto/class_printGeneric.inc:305
+#: admin/systems/goto/class_printGeneric.inc:310
+#: admin/systems/goto/class_printGeneric.inc:360
+#: admin/systems/goto/class_printGeneric.inc:376
+#: admin/systems/goto/class_printGeneric.inc:379
 msgid "Add printer extension"
 msgstr "添加打印机扩展"
 
-#: admin/systems/goto/class_printGeneric.inc:291
+#: admin/systems/goto/class_printGeneric.inc:298
 #, fuzzy
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr "在构建时缺少 parent 参数，无法初始化打印机页面。"
 
-#: admin/systems/goto/class_printGeneric.inc:299
+#: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
 msgstr "这是一个工作站模板，打印机页被禁用。"
 
-#: admin/systems/goto/class_printGeneric.inc:304
+#: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "这是一个终端模板，打印机页被禁用。"
 
-#: admin/systems/goto/class_printGeneric.inc:345
 #: admin/systems/goto/class_printGeneric.inc:353
 #: admin/systems/goto/class_printGeneric.inc:361
-#: admin/systems/goto/class_printGeneric.inc:364
 #: admin/systems/goto/class_printGeneric.inc:369
 #: admin/systems/goto/class_printGeneric.inc:372
+#: admin/systems/goto/class_printGeneric.inc:377
+#: admin/systems/goto/class_printGeneric.inc:380
 #, fuzzy
 msgid "printer"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:353
+#: admin/systems/goto/class_printGeneric.inc:361
 #, fuzzy
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
@@ -1650,75 +1650,75 @@ msgstr ""
 "这个对象已经禁用打印机插件。您不能在 'cn' 不存在于条目中时启用它。可能您正在"
 "创建一个新的终端模板"
 
-#: admin/systems/goto/class_printGeneric.inc:360
-#: admin/systems/goto/class_printGeneric.inc:363
+#: admin/systems/goto/class_printGeneric.inc:368
+#: admin/systems/goto/class_printGeneric.inc:371
 msgid "Remove printer extension"
 msgstr "删除打印机扩展"
 
-#: admin/systems/goto/class_printGeneric.inc:594
+#: admin/systems/goto/class_printGeneric.inc:564
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "您当前选择的 PPD 文件 '%s' 不存在。"
 
-#: admin/systems/goto/class_printGeneric.inc:600
+#: admin/systems/goto/class_printGeneric.inc:570
 #, fuzzy
 msgid "Not defined"
 msgstr "未定义"
 
-#: admin/systems/goto/class_printGeneric.inc:604
+#: admin/systems/goto/class_printGeneric.inc:574
 #: admin/systems/ppd/class_printerPPDDialog.inc:96
 msgid "Can't get ppd informations."
 msgstr "无法获取 ppd 信息。"
 
-#: admin/systems/goto/class_printGeneric.inc:620
-#: admin/systems/goto/class_printGeneric.inc:622
+#: admin/systems/goto/class_printGeneric.inc:590
+#: admin/systems/goto/class_printGeneric.inc:592
 #, fuzzy, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr "该打印机属于终端 %s。您不能重命名该打印机。"
 
-#: admin/systems/goto/class_printGeneric.inc:620
+#: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:232
+#: admin/systems/goto/class_terminalGeneric.inc:209
 #, fuzzy
 msgid "terminal"
 msgstr "终端"
 
-#: admin/systems/goto/class_printGeneric.inc:622
-#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_printGeneric.inc:592
+#: admin/systems/goto/class_workstationGeneric.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
 msgstr "工作站"
 
-#: admin/systems/goto/class_printGeneric.inc:669
-#: admin/systems/goto/class_printGeneric.inc:676
+#: admin/systems/goto/class_printGeneric.inc:639
+#: admin/systems/goto/class_printGeneric.inc:646
 #, fuzzy
 msgid "Object is no printer!"
 msgstr "网络打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:770
-#: admin/systems/goto/printer.tpl:54
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/printer.tpl:49
 msgid "Printer URL"
 msgstr "打印机 URL"
 
-#: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_printGeneric.inc:1000
+#: admin/systems/goto/class_printGeneric.inc:972
+#: admin/systems/goto/class_printGeneric.inc:974
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "组"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:977
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "用户"
 
-#: admin/systems/goto/class_printGeneric.inc:1016
+#: admin/systems/goto/class_printGeneric.inc:990
 #, fuzzy
 msgid "Print generic"
 msgstr "打印服务"
 
-#: admin/systems/goto/class_printGeneric.inc:1021
+#: admin/systems/goto/class_printGeneric.inc:995
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1726,44 +1726,44 @@ msgstr "打印服务"
 msgid "Printer"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1028
+#: admin/systems/goto/class_printGeneric.inc:1002
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1029
+#: admin/systems/goto/class_printGeneric.inc:1003
 #, fuzzy
 msgid "Printer PPD"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1030
-#: admin/systems/goto/printer.tpl:91
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/printer.tpl:86
 msgid "Permissions"
 msgstr "允许"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #: personal/environment/class_environment.inc:583
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: admin/systems/goto/class_printGeneric.inc:1046
-#: admin/systems/goto/class_printGeneric.inc:1068
+#: admin/systems/goto/class_printGeneric.inc:1020
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "printer user"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1063
+#: admin/systems/goto/class_printGeneric.inc:1037
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1103
+#: admin/systems/goto/class_printGeneric.inc:1077
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "该名称已经被使用。"
 
-#: admin/systems/goto/class_printGeneric.inc:1114
+#: admin/systems/goto/class_printGeneric.inc:1088
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "PPD 管理员：给出的路径 '%s' 不存在。"
@@ -1877,7 +1877,7 @@ msgid "System informations"
 msgstr "系统信息"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:705
+#: admin/systems/goto/class_workstationGeneric.inc:685
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1885,8 +1885,8 @@ msgstr "工作站"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:669
+#: admin/systems/goto/class_terminalGeneric.inc:675
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "终端"
@@ -2194,57 +2194,59 @@ msgstr "声音服务"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:310
+#: admin/systems/goto/class_workstationGeneric.inc:276
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "立即更新"
 
-#: admin/systems/goto/class_workstationGeneric.inc:304
-#: admin/systems/goto/class_workstationGeneric.inc:312
+#: admin/systems/goto/class_workstationGeneric.inc:280
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: admin/systems/goto/class_workstationGeneric.inc:308
-#: admin/systems/goto/class_terminalGeneric.inc:273
+#: admin/systems/goto/class_workstationGeneric.inc:284
+#: admin/systems/goto/class_terminalGeneric.inc:249
+#: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "唤醒"
 
-#: admin/systems/goto/class_workstationGeneric.inc:501
+#: admin/systems/goto/class_workstationGeneric.inc:481
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:491
 #, fuzzy
 msgid "Software deployment"
 msgstr "系统类型"
 
-#: admin/systems/goto/class_workstationGeneric.inc:512
+#: admin/systems/goto/class_workstationGeneric.inc:492
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:700
+#: admin/systems/goto/class_workstationGeneric.inc:680
 #, fuzzy
 msgid "Workstation generic"
 msgstr "工作站名称"
 
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #, fuzzy
 msgid "Goto mode"
 msgstr "到目录"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:695
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #, fuzzy
 msgid "Root password"
 msgstr "设置口令"
 
-#: admin/systems/goto/class_workstationGeneric.inc:716
+#: admin/systems/goto/class_workstationGeneric.inc:696
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "创建"
@@ -2311,7 +2313,7 @@ msgstr "电话"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:75
+#: admin/systems/goto/printer.tpl:70
 msgid "Driver"
 msgstr "驱动"
 
@@ -2373,7 +2375,6 @@ msgstr "选择连接终端服务器的方法"
 #: admin/systems/goto/terminalService.tpl:184
 #: admin/systems/goto/terminalStartup.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:36
-#: addons/goto/class_gotomasses.inc:400
 #, fuzzy
 msgid "Reload"
 msgstr "读"
@@ -2627,17 +2628,17 @@ msgstr "分配的 FAI 类"
 msgid "set"
 msgstr "设置"
 
-#: admin/systems/goto/class_terminalGeneric.inc:690
+#: admin/systems/goto/class_terminalGeneric.inc:670
 #, fuzzy
 msgid "Terminal generic"
 msgstr "终端服务"
 
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:683
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "日志服务器"
 
-#: admin/systems/goto/class_terminalGeneric.inc:708
+#: admin/systems/goto/class_terminalGeneric.inc:688
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "用户设置"
@@ -2650,35 +2651,31 @@ msgstr "普通"
 msgid "Printer name"
 msgstr "打印机名称"
 
-#: admin/systems/goto/printer.tpl:30
-msgid "Choose subtree to place user in"
-msgstr "将用户放到所选择子树中"
-
-#: admin/systems/goto/printer.tpl:43
+#: admin/systems/goto/printer.tpl:38
 msgid "Details"
 msgstr "详细"
 
-#: admin/systems/goto/printer.tpl:46
+#: admin/systems/goto/printer.tpl:41
 msgid "Printer location"
 msgstr "打印机位置"
 
-#: admin/systems/goto/printer.tpl:63
+#: admin/systems/goto/printer.tpl:58
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:98
+#: admin/systems/goto/printer.tpl:93
 msgid "Users which are allowed to use this printer"
 msgstr "允许使用该打印机的用户"
 
-#: admin/systems/goto/printer.tpl:100
+#: admin/systems/goto/printer.tpl:95
 msgid "Users"
 msgstr "用户"
 
-#: admin/systems/goto/printer.tpl:119
+#: admin/systems/goto/printer.tpl:114
 msgid "Users which are allowed to administrate this printer"
 msgstr "允许管理该打印机的用户"
 
-#: admin/systems/goto/printer.tpl:121
+#: admin/systems/goto/printer.tpl:116
 msgid "Admins"
 msgstr "管理员"
 
@@ -2731,12 +2728,7 @@ msgstr "终端模板"
 msgid "Terminal name"
 msgstr "终端名称"
 
-#: admin/systems/goto/terminal.tpl:31
-#, fuzzy
-msgid "Choose subtree to place terminal in"
-msgstr "将用户放到所选择子树中"
-
-#: admin/systems/goto/terminal.tpl:177
+#: admin/systems/goto/terminal.tpl:172
 #, fuzzy
 msgid "Inherit all"
 msgstr "中间名"
@@ -3021,7 +3013,7 @@ msgstr "过期"
 msgid "MAC"
 msgstr "ACL"
 
-#: addons/goto/goto_import_file.tpl:39
+#: addons/goto/goto_import_file.tpl:39 addons/goto/deploy-list.xml:14
 #: addons/goto/class_goto_import_file.inc:171
 #, fuzzy
 msgid "Event"
@@ -3059,53 +3051,76 @@ msgstr "登录名"
 msgid "GOto log view"
 msgstr "到目录"
 
-#: addons/goto/class_gotomasses.inc:26
-#, fuzzy
-msgid "Deployment status"
-msgstr "系统状态"
-
-#: addons/goto/class_gotomasses.inc:27 addons/goto/main.inc:66
+#: addons/goto/class_gotomasses.inc:26 addons/goto/class_gotomasses.inc:27
 #, fuzzy
 msgid "System deployment status"
 msgstr "系统类型"
 
-#: addons/goto/class_gotomasses.inc:230
+#: addons/goto/class_gotomasses.inc:159
+msgid "immediately"
+msgstr ""
+
+#: addons/goto/class_gotomasses.inc:175
+#, fuzzy
+msgid "Waiting"
+msgstr "警告"
+
+#: addons/goto/class_gotomasses.inc:181
+#, fuzzy
+msgid "Processed"
+msgstr "属性"
+
+#: addons/goto/class_gotomasses.inc:196
+#, fuzzy
+msgid "Detection"
+msgstr "节"
+
+#: addons/goto/class_gotomasses.inc:204
+#, fuzzy
+msgid "in progress"
+msgstr "属性"
+
+#: addons/goto/class_gotomasses.inc:228
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: addons/goto/class_gotomasses.inc:270
+#: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/goto/class_gotomasses.inc:360
-#, fuzzy
-msgid "This menu allows you to remove and change the properties of GOsa tasks."
-msgstr "这个菜单允许您创建，删除和修改仓库设置。"
+#: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
+#: addons/goto/class_gotomasses.inc:550
+#, fuzzy, php-format
+msgid "Cannot update queue entry: %s"
+msgstr "未知 FAIstate %s"
 
-#: addons/goto/class_gotomasses.inc:361
-#, fuzzy
-msgid "List of queued jobs"
-msgstr "设备列表"
+#: addons/goto/class_gotomasses.inc:330
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:380
-#, fuzzy
-msgid "Resume"
-msgstr "重新安装"
+#: addons/goto/class_gotomasses.inc:514
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
 
-#: addons/goto/class_gotomasses.inc:381
+#: addons/goto/class_gotomasses.inc:564 addons/goto/class_gotomasses.inc:570
 #, fuzzy
-msgid "Pause"
-msgstr "ç²\98è´´"
+msgid "System deployment"
+msgstr "ç³»ç»\9f管ç\90\86"
 
-#: addons/goto/class_gotomasses.inc:382
+#: addons/goto/class_gotomasses.inc:565
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
+
+#: addons/goto/deploy-list.xml:10
 #, fuzzy
-msgid "Abort"
-msgstr "端口"
+msgid "List of queued jobs"
+msgstr "设备列表"
 
-#: addons/goto/class_gotomasses.inc:408
-#: addons/goto/events/DaemonEvent_update.tpl:47
+#: addons/goto/deploy-list.xml:27 addons/goto/events/DaemonEvent_update.tpl:47
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:47
 #: addons/goto/events/DaemonEvent_halt.tpl:47
 #: addons/goto/events/DaemonEvent_wakeup.tpl:47
@@ -3128,17 +3143,16 @@ msgstr "端口"
 msgid "Target"
 msgstr "芯片组"
 
-#: addons/goto/class_gotomasses.inc:409
+#: addons/goto/deploy-list.xml:35
 msgid "Task"
 msgstr "任务"
 
-#: addons/goto/class_gotomasses.inc:411
+#: addons/goto/deploy-list.xml:43
 #, fuzzy
 msgid "Period"
 msgstr "允许"
 
-#: addons/goto/class_gotomasses.inc:413
-#: addons/goto/events/DaemonEvent_update.tpl:9
+#: addons/goto/deploy-list.xml:51 addons/goto/events/DaemonEvent_update.tpl:9
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:9
 #: addons/goto/events/DaemonEvent_halt.tpl:9
 #: addons/goto/events/DaemonEvent_wakeup.tpl:9
@@ -3157,8 +3171,7 @@ msgstr "允许"
 msgid "Schedule"
 msgstr "PHPscheduleit"
 
-#: addons/goto/class_gotomasses.inc:415
-#: addons/goto/events/DaemonEvent_update.tpl:39
+#: addons/goto/deploy-list.xml:59 addons/goto/events/DaemonEvent_update.tpl:39
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:39
 #: addons/goto/events/DaemonEvent_halt.tpl:39
 #: addons/goto/events/DaemonEvent_wakeup.tpl:39
@@ -3177,85 +3190,58 @@ msgstr "PHPscheduleit"
 msgid "Status"
 msgstr "状态"
 
-#: addons/goto/class_gotomasses.inc:443
-#, fuzzy
-msgid "Pause job"
-msgstr "粘贴"
-
-#: addons/goto/class_gotomasses.inc:450
+#: addons/goto/deploy-list.xml:112
+#: addons/goto/events/class_DaemonEvent_lock.inc:29
+#: addons/goto/events/class_DaemonEvent_lock.inc:30
 #, fuzzy
-msgid "Resume job"
-msgstr "é\87\8dæ\96°å®\89è£\85"
+msgid "Lock"
+msgstr "é\94\81å®\9a"
 
-#: addons/goto/class_gotomasses.inc:457
+#: addons/goto/deploy-list.xml:119
+#: addons/goto/events/class_DaemonEvent_activate.inc:29
+#: addons/goto/events/class_DaemonEvent_activate.inc:30
 #, fuzzy
-msgid "Execute now"
-msgstr "执行"
+msgid "Unlock"
+msgstr "锁定"
 
-#: addons/goto/class_gotomasses.inc:464
+#: addons/goto/deploy-list.xml:156 addons/goto/deploy-list.xml:217
 #, fuzzy
-msgid "View logs"
-msgstr "可用的应用程序"
+msgid "Resume"
+msgstr "重新安装"
 
-#: addons/goto/class_gotomasses.inc:479
+#: addons/goto/deploy-list.xml:163 addons/goto/deploy-list.xml:209
 #, fuzzy
-msgid "Abort job"
-msgstr "中间名"
+msgid "Pause"
+msgstr "粘贴"
 
-#: addons/goto/class_gotomasses.inc:525
+#: addons/goto/deploy-list.xml:170 addons/goto/deploy-list.xml:257
 #, fuzzy
-msgid "Waiting"
-msgstr "警告"
+msgid "Abort"
+msgstr "端口"
 
-#: addons/goto/class_gotomasses.inc:531
-#, fuzzy
-msgid "Processed"
-msgstr "属性"
+#: addons/goto/deploy-list.xml:193
+msgid "Up"
+msgstr "上"
 
-#: addons/goto/class_gotomasses.inc:546
-#, fuzzy
-msgid "Detection"
-msgstr "节"
+#: addons/goto/deploy-list.xml:201
+msgid "Down"
+msgstr "关闭"
 
-#: addons/goto/class_gotomasses.inc:554
+#: addons/goto/deploy-list.xml:225
 #, fuzzy
-msgid "in progress"
+msgid "Process now"
 msgstr "属性"
 
-#: addons/goto/class_gotomasses.inc:578
-msgid "immediately"
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:670 addons/goto/class_gotomasses.inc:750
-#: addons/goto/class_gotomasses.inc:790
-#, fuzzy, php-format
-msgid "Cannot update queue entry: %s"
-msgstr "未知 FAIstate %s"
-
-#: addons/goto/class_gotomasses.inc:706
-#, php-format
-msgid "Cannot update queue entries."
-msgstr ""
-
-#: addons/goto/class_gotomasses.inc:755
-#, php-format
-msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr ""
+#: addons/goto/deploy-list.xml:233
+#, fuzzy
+msgid "View logs"
+msgstr "可用的应用程序"
 
-#: addons/goto/class_gotomasses.inc:831
+#: addons/goto/class_filterGotoEvents.inc:18
 #, fuzzy, php-format
 msgid "Cannot load queue entries: %s"
 msgstr "未知 FAIstate %s"
 
-#: addons/goto/class_gotomasses.inc:925 addons/goto/class_gotomasses.inc:931
-#, fuzzy
-msgid "System deployment"
-msgstr "系统管理"
-
-#: addons/goto/class_gotomasses.inc:926
-msgid "Provide a mechanism to automatically activate systems"
-msgstr ""
-
 #: addons/goto/log_view.tpl:7
 #, fuzzy
 msgid "Available logs"
@@ -3271,12 +3257,6 @@ msgstr "选择"
 msgid "No logs for this host available!"
 msgstr "文件可用。"
 
-#: addons/goto/events/class_DaemonEvent_lock.inc:29
-#: addons/goto/events/class_DaemonEvent_lock.inc:30
-#, fuzzy
-msgid "Lock"
-msgstr "锁定"
-
 #: addons/goto/events/DaemonEvent_update.tpl:18
 #: addons/goto/events/DaemonEvent_reload_ldap_config.tpl:18
 #: addons/goto/events/DaemonEvent_halt.tpl:18
@@ -3346,12 +3326,6 @@ msgstr "到目录"
 msgid "Reload GOto settings"
 msgstr "Posix 设置"
 
-#: addons/goto/events/class_DaemonEvent_activate.inc:29
-#: addons/goto/events/class_DaemonEvent_activate.inc:30
-#, fuzzy
-msgid "Unlock"
-msgstr "锁定"
-
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:28
 #: addons/goto/events/class_DaemonEvent_faireboot.inc:29
 #, fuzzy
@@ -3533,7 +3507,7 @@ msgstr "显示服务器"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
 #, fuzzy
-msgid "List of systems"
+msgid "List of target systems"
 msgstr "用户列表"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
@@ -3873,6 +3847,41 @@ msgstr "最后脚本"
 msgid "Script can be replaced by user"
 msgstr "可以被用户替换的脚本"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "选择来放置组的子树"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "将用户放到所选择子树中"
+
+#, fuzzy
+#~ msgid "Choose subtree to place terminal in"
+#~ msgstr "将用户放到所选择子树中"
+
+#, fuzzy
+#~ msgid "Deployment status"
+#~ msgstr "系统状态"
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to remove and change the properties of GOsa tasks."
+#~ msgstr "这个菜单允许您创建，删除和修改仓库设置。"
+
+#, fuzzy
+#~ msgid "Pause job"
+#~ msgstr "粘贴"
+
+#, fuzzy
+#~ msgid "Resume job"
+#~ msgstr "重新安装"
+
+#, fuzzy
+#~ msgid "Execute now"
+#~ msgstr "执行"
+
+#, fuzzy
+#~ msgid "Abort job"
+#~ msgstr "中间名"
+
 #~ msgid "Submit"
 #~ msgstr "提交"
 
@@ -5807,9 +5816,6 @@ msgstr "可以被用户替换的脚本"
 #~ msgid "Go up one department"
 #~ msgstr "向上跳转一个部门"
 
-#~ msgid "Up"
-#~ msgstr "上"
-
 #~ msgid "Go to users department"
 #~ msgstr "转到用户部门"
 
@@ -5871,9 +5877,6 @@ msgstr "可以被用户替换的脚本"
 #~ msgid "Groups"
 #~ msgstr "用户组"
 
-#~ msgid "Down"
-#~ msgstr "关闭"
-
 #, fuzzy
 #~ msgid "category ACL"
 #~ msgstr "分类"