Added Translation Strings.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 9db0e5b6354960ac9e214cdbed75576d788d9899..783e33b0fe6618ea79bfb80e50c3a2e280ea49a4 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-14 11:47+0100\n"
+"POT-Creation-Date: 2007-01-17 11:46+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"
@@ -64,36 +64,37 @@ msgstr ""
 
 #: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_divListGroup.inc:136
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/groups/class_divListGroup.inc:131
+#: plugins/admin/users/class_divListUsers.inc:141
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_divListGroup.inc:128
-#: plugins/admin/users/class_divListUsers.inc:166
-#: plugins/admin/ogroups/tabs_ogroups.inc:75
-#: plugins/admin/ogroups/tabs_ogroups.inc:175
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: plugins/admin/groups/class_divListGroup.inc:123
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/ogroups/tabs_ogroups.inc:77
+#: plugins/admin/ogroups/tabs_ogroups.inc:178
+#: plugins/admin/ogroups/class_divListOGroup.inc:124
+#: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_divListGroup.inc:130
-#: plugins/admin/users/class_divListUsers.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:125
+#: plugins/admin/users/class_divListUsers.inc:149
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
 #: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:174
+#: plugins/admin/users/class_divListUsers.inc:151
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:140
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:143
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
@@ -103,7 +104,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:147
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -117,10 +118,10 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/groups/class_divListGroup.inc:129
+#: plugins/admin/users/class_divListUsers.inc:145
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:869
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -150,30 +151,30 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
-#: plugins/admin/systems/class_servRepository.inc:254
+#: plugins/admin/systems/class_servRepository.inc:287
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/gofon/conference/generic.tpl:100
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:658
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:872
 msgid "Parameter"
 msgstr ""
 
 #: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:98
+#: plugins/admin/ogroups/tabs_ogroups.inc:100
 msgid "Startup"
 msgstr ""
 
 #: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:102
+#: plugins/admin/ogroups/tabs_ogroups.inc:104
 msgid "Devices"
 msgstr ""
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:850
+#: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -187,15 +188,15 @@ msgstr ""
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/servRepository.tpl:24
+#: plugins/admin/systems/servRepository.tpl:26
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:63
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:66
 msgid "Information"
 msgstr ""
 
@@ -275,7 +276,7 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:227 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: contrib/gosa.conf:227 plugins/admin/ogroups/tabs_ogroups.inc:109
 msgid "Summary"
 msgstr ""
 
@@ -287,35 +288,35 @@ msgstr ""
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:262
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:274
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:275
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:276
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:277
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:278
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:279
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:280
 msgid "Polish"
 msgstr ""
 
@@ -330,12 +331,12 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/class_faiManagement.inc:568
+#: plugins/admin/fai/class_faiManagement.inc:591
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:360
-#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/goSpamServer.tpl:101
@@ -344,14 +345,14 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:575
+#: plugins/admin/systems/class_systemManagement.inc:597
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:238
 #: include/class_MultiSelectWindow.inc:78
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Save"
 msgstr ""
 
@@ -362,6 +363,7 @@ msgstr ""
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:92
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -380,13 +382,12 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/godfs/class_dfsManagment.inc:249
-#: plugins/admin/fai/class_faiManagement.inc:570
-#: plugins/admin/fai/class_faiManagement.inc:575
+#: plugins/admin/fai/class_faiManagement.inc:593
+#: plugins/admin/fai/class_faiManagement.inc:598
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiPackageNew.tpl:51
 #: plugins/admin/fai/faiNewBranch.tpl:22
 #: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57
@@ -394,18 +395,18 @@ msgstr ""
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/groups/class_groupManagement.inc:345
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:627
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:304
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
@@ -424,11 +425,12 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/class_systemManagement.inc:599
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/gencd.tpl:11
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
@@ -437,10 +439,10 @@ msgstr ""
 #: plugins/admin/ogroups/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:240
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:16
 msgid "Cancel"
 msgstr ""
 
@@ -458,8 +460,8 @@ msgstr ""
 #: plugins/personal/nagios/main.inc:116 plugins/personal/mail/main.inc:116
 #: plugins/personal/posix/main.inc:123 plugins/personal/netatalk/main.inc:112
 #: plugins/personal/samba/main.inc:116
-#: plugins/personal/environment/main.inc:116
 #: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/main.inc:116
 #: plugins/personal/generic/main.inc:173
 #: plugins/personal/connectivity/main.inc:130
 #: plugins/gofax/faxaccount/generic.tpl:86
@@ -527,48 +529,48 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:99
+#: plugins/personal/nagios/class_nagiosAccount.inc:105
 msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:108
+#: plugins/personal/nagios/class_nagiosAccount.inc:114
 msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:109
+#: plugins/personal/nagios/class_nagiosAccount.inc:115
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:111
+#: plugins/personal/nagios/class_nagiosAccount.inc:117
 msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:111
+#: plugins/personal/nagios/class_nagiosAccount.inc:117
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:154
+#: plugins/personal/nagios/class_nagiosAccount.inc:160
 msgid "Saving nagios account failed"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:180
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:177
+#: plugins/personal/nagios/class_nagiosAccount.inc:183
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:181
-#: plugins/personal/nagios/class_nagiosAccount.inc:185
+#: plugins/personal/nagios/class_nagiosAccount.inc:187
+#: plugins/personal/nagios/class_nagiosAccount.inc:191
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:233
+#: plugins/personal/nagios/class_nagiosAccount.inc:239
 msgid "Removing nagios account failed"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgstr ""
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/servRepository.tpl:38
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
@@ -677,8 +679,8 @@ msgstr ""
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:72
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
 msgid "Filters"
 msgstr ""
 
@@ -726,16 +728,16 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/environment/hotplugDialog.tpl:63
-#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/hotplugDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:235
+#: plugins/personal/connectivity/class_kolabAccount.inc:242
 #: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
@@ -745,7 +747,7 @@ msgstr ""
 #: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:558
+#: plugins/admin/groups/class_groupMail.inc:571
 #: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/groups/group_objects.tpl:55
@@ -757,14 +759,14 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/workstationStartup.tpl:103
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:143
+#: plugins/admin/systems/workstationStartup.tpl:105
+#: plugins/admin/systems/workstationStartup.tpl:128
+#: plugins/admin/systems/workstationStartup.tpl:147
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:459
-#: plugins/admin/systems/class_termDNS.inc:479
+#: plugins/admin/systems/class_termDNS.inc:454
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/systems/servdnseditzone.tpl:106
@@ -772,14 +774,14 @@ msgstr ""
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:399
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:486
+#: plugins/admin/systems/class_servDNSeditZone.inc:498
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/ogroups/termgroup.tpl:23
-#: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/gofon/phoneaccount/generic.tpl:13
@@ -795,7 +797,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:870
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -812,7 +814,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:493
+#: plugins/admin/systems/class_printGeneric.inc:506
 msgid "not defined"
 msgstr ""
 
@@ -838,11 +840,11 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:635
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/class_environment.inc:653
 #: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -861,25 +863,26 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/systems/workstationStartup.tpl:104
-#: plugins/admin/systems/workstationStartup.tpl:125
+#: plugins/admin/systems/workstationStartup.tpl:106
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:473
+#: plugins/admin/systems/class_termDNS.inc:468
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
 #: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/printer.tpl:78 plugins/admin/systems/printer.tpl:96
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/class_servDNSeditZone.inc:298
+#: plugins/admin/systems/class_servDNSeditZone.inc:492
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/ogroups/termgroup.tpl:25
-#: plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/admin/ogroups/phonequeue.tpl:29
 #: plugins/admin/ogroups/generic.tpl:44 plugins/admin/ogroups/remove.tpl:14
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
@@ -931,7 +934,7 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
+#: plugins/personal/connectivity/class_proxyAccount.inc:95
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
@@ -981,7 +984,7 @@ msgid "User mail settings"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:76
+#: plugins/admin/groups/class_groupMail.inc:83
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
@@ -990,121 +993,121 @@ msgstr ""
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:251
+#: plugins/personal/mail/class_mailAccount.inc:257
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:261
-#: plugins/personal/mail/class_mailAccount.inc:264
-#: plugins/admin/groups/class_groupMail.inc:323
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/personal/mail/class_mailAccount.inc:267
+#: plugins/personal/mail/class_mailAccount.inc:270
+#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:262
+#: plugins/personal/mail/class_mailAccount.inc:268
 msgid ""
 "This account can't be removed while there are delegations configured. Remove "
 "those delegations first."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/personal/mail/class_mailAccount.inc:271
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:268
-#: plugins/admin/groups/class_groupMail.inc:326
-#: plugins/admin/ogroups/class_mailogroup.inc:43
+#: plugins/personal/mail/class_mailAccount.inc:274
+#: plugins/admin/groups/class_groupMail.inc:339
+#: plugins/admin/ogroups/class_mailogroup.inc:50
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:268
-#: plugins/admin/groups/class_groupMail.inc:327
+#: plugins/personal/mail/class_mailAccount.inc:274
+#: plugins/admin/groups/class_groupMail.inc:340
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:318
+#: plugins/personal/mail/class_mailAccount.inc:324
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:324
-#: plugins/admin/groups/class_groupMail.inc:401
+#: plugins/personal/mail/class_mailAccount.inc:330
+#: plugins/admin/groups/class_groupMail.inc:414
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/personal/mail/class_mailAccount.inc:367
-#: plugins/admin/groups/class_groupMail.inc:429
+#: plugins/personal/mail/class_mailAccount.inc:368
+#: plugins/personal/mail/class_mailAccount.inc:373
+#: plugins/admin/groups/class_groupMail.inc:442
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:377
-#: plugins/admin/groups/class_groupMail.inc:434
+#: plugins/personal/mail/class_mailAccount.inc:383
+#: plugins/admin/groups/class_groupMail.inc:447
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:646
+#: plugins/personal/mail/class_mailAccount.inc:670
 msgid "Removing mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:750
+#: plugins/personal/mail/class_mailAccount.inc:799
 msgid "Saving mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:802
+#: plugins/personal/mail/class_mailAccount.inc:851
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:807
-#: plugins/admin/groups/class_groupMail.inc:832
+#: plugins/personal/mail/class_mailAccount.inc:856
+#: plugins/admin/groups/class_groupMail.inc:845
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:811
-#: plugins/personal/mail/class_mailAccount.inc:815
+#: plugins/personal/mail/class_mailAccount.inc:860
+#: plugins/personal/mail/class_mailAccount.inc:864
 #: plugins/addons/addressbook/class_addressbook.inc:598
-#: plugins/admin/ogroups/class_mailogroup.inc:71
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:821
-#: plugins/admin/groups/class_groupMail.inc:841
-#: plugins/admin/ogroups/class_mailogroup.inc:78
+#: plugins/personal/mail/class_mailAccount.inc:870
+#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/ogroups/class_mailogroup.inc:85
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:827
-#: plugins/admin/groups/class_groupMail.inc:847
+#: plugins/personal/mail/class_mailAccount.inc:876
+#: plugins/admin/groups/class_groupMail.inc:860
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:836
-#: plugins/admin/groups/class_groupMail.inc:856
+#: plugins/personal/mail/class_mailAccount.inc:885
+#: plugins/admin/groups/class_groupMail.inc:869
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:846
-#: plugins/admin/groups/class_groupMail.inc:864
+#: plugins/personal/mail/class_mailAccount.inc:895
+#: plugins/admin/groups/class_groupMail.inc:877
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:850
+#: plugins/personal/mail/class_mailAccount.inc:899
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1004
+#: plugins/personal/mail/class_mailAccount.inc:1053
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1006
+#: plugins/personal/mail/class_mailAccount.inc:1055
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1164,8 +1167,9 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1525
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/systems/class_systemManagement.inc:243
+#: include/functions.inc:1528 ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
@@ -1210,14 +1214,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:46 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:243
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:49 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:226
+#: plugins/admin/users/class_userManagement.inc:248
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1238,14 +1242,14 @@ msgid "External password changer reported a problem: "
 msgstr ""
 
 #: plugins/personal/password/main.inc:118
-#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Change password"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Home directory"
 msgstr ""
 
@@ -1379,205 +1383,205 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:131
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:133
+#: plugins/personal/posix/class_posixAccount.inc:132
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:139
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:151
+#: plugins/personal/posix/class_posixAccount.inc:150
 #: plugins/personal/posix/class_posixAccount.inc:998
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:186
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:212
+#: plugins/personal/posix/class_posixAccount.inc:205
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:793
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:216
+#: plugins/admin/systems/class_workstationStartup.inc:832
+#: plugins/admin/systems/class_terminalService.inc:195
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:271
-#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:272
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:272
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:276
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:279
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:279
+#: plugins/personal/posix/class_posixAccount.inc:280
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:443
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:445
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:447
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:448
+#: plugins/personal/posix/class_posixAccount.inc:449
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:480
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:481
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:250
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:480
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:481
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:250
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:480
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:481
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:250
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:480
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:481
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:250
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:481
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:482
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:251
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:481
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:482
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:251
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:481
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:482
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:251
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:481
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:482
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:251
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:481
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:482
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:251
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:483
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/generic/class_user.inc:252
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:483
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/generic/class_user.inc:252
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:483
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:436
+#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/generic/class_user.inc:252
 msgid "December"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:564
-#: plugins/personal/samba/class_sambaAccount.inc:462
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/personal/samba/class_sambaAccount.inc:496
+#: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1620,12 +1624,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:930
-#: plugins/admin/groups/class_groupGeneric.inc:785
+#: plugins/admin/groups/class_groupGeneric.inc:787
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:933
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:790
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
@@ -1665,8 +1669,8 @@ msgstr ""
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1103
-#: plugins/admin/groups/class_groupGeneric.inc:824
+#: plugins/personal/posix/class_posixAccount.inc:1115
+#: plugins/admin/groups/class_groupGeneric.inc:826
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1681,7 +1685,7 @@ msgstr ""
 
 #: plugins/personal/netatalk/main.inc:104
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:24
 msgid "Finish"
 msgstr ""
 
@@ -1693,40 +1697,40 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:167
+#: plugins/personal/netatalk/class_netatalk.inc:178
 msgid "This account has no netatalk extensions."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:176
+#: plugins/personal/netatalk/class_netatalk.inc:187
 msgid "Remove netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:177
+#: plugins/personal/netatalk/class_netatalk.inc:188
 msgid ""
 "This account has netatalk features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:188
-#: plugins/personal/netatalk/class_netatalk.inc:191
+#: plugins/personal/netatalk/class_netatalk.inc:199
+#: plugins/personal/netatalk/class_netatalk.inc:202
 msgid "Create netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:189
+#: plugins/personal/netatalk/class_netatalk.inc:200
 msgid ""
 "This account has netatalk features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:221
+#: plugins/personal/netatalk/class_netatalk.inc:232
 msgid "You must select a share to use."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:280
+#: plugins/personal/netatalk/class_netatalk.inc:291
 msgid "Saving Netatalk account failed"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:340
+#: plugins/personal/netatalk/class_netatalk.inc:351
 msgid "Removing Netatalk account failed"
 msgstr ""
 
@@ -1740,7 +1744,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "Profile path"
 msgstr ""
 
@@ -1789,17 +1793,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:701
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:702
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid "IDLE"
 msgstr ""
 
@@ -1852,7 +1856,15 @@ msgstr ""
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Samba logon times"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Edit settings..."
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr ""
 
@@ -1868,300 +1880,159 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:214
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:223
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:224
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:234
+#: plugins/personal/samba/class_sambaAccount.inc:237
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:235
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:238
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:499
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:502
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:505
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:506
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:677
 msgid "Removing Samba account failed"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:696
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:706
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:712
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:909
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:933
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1037
 msgid "Saving Samba account failed"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:125
-msgid "User environment settings"
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:127
-msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:130
-msgid "Invalid character in description. Please specify a valid description."
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:134
-msgid "Please specify a valid id."
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:137
-msgid "Please specify a valid vendor id. (2 byte hex like '0xFFFF')"
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:140
-msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:145
-msgid "An Entry with this name already exists."
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:150
-msgid "Please select an entry or press cancel."
-msgstr ""
-
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
-msgid "Please select a printer or press cancel."
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:1
-msgid "Add hotplug devices"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:5
-msgid "Hotplug management"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:10
-msgid "Select hotplug device to add"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:34
-msgid "Choose the department the search will be based    on"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/fai/class_divListFai.inc:75
-#: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:66
-#: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/systems/glpiSelectUser.tpl:35
-#: plugins/gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:48
-msgid "Regular expression for        matching hotplugs"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:187
-msgid "auto"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:209
-#: plugins/admin/systems/class_workstationService.inc:88
-#: plugins/admin/systems/class_terminalService.inc:95
-#, php-format
-msgid ""
-"You have specified an external resolution hook which can't be read, please "
-"check the permission of the file '%s'."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:301
-#: plugins/personal/environment/class_environment.inc:337
-msgid "Remove environment extension"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:302
-#: plugins/personal/environment/class_environment.inc:338
-msgid "Environment extension enabled. You can disable it by clicking below."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:311
-#: plugins/personal/environment/class_environment.inc:316
-#: plugins/personal/environment/class_environment.inc:343
-#: plugins/personal/environment/class_environment.inc:348
-msgid "Add environment extension"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:312
-#: plugins/personal/environment/class_environment.inc:344
-msgid "Environment extension disabled. You can enable it by clicking below."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:317
-#: plugins/personal/environment/class_environment.inc:349
-msgid ""
-"Environment extension disabled. You have to setup a posix account before you "
-"can enable this feature."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:464
-#: plugins/personal/environment/class_environment.inc:782
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
-msgid "None"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:547
-#: plugins/personal/environment/class_environment.inc:560
-#: plugins/admin/systems/class_workstationStartup.inc:611
-#: plugins/admin/systems/class_terminalStartup.inc:201
-msgid "You must specify a valid mount point."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:549
-msgid "Spaces are not allowed in the mount path!"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:622
-#: plugins/personal/environment/class_environment.inc:623
-#: plugins/personal/environment/class_environment.inc:631
-#: plugins/personal/environment/class_environment.inc:632
-msgid "Reset password hash"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:636
-msgid "Delete share entry"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:785
-#, php-format
-msgid ""
-"The selected kiosk profile '%s' is no longer available, setting current "
-"profile to 'none'."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:836
-msgid "Removing environment information failed"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:890
-msgid "Please set a valid profile quota size."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:897
-msgid ""
-"You need to setup a valid posix extension in order to enable evironment "
-"features."
+#: plugins/personal/samba/class_sambaLogonHours.inc:62
+msgid "Sunday"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:935
-msgid "Can't save new kiosk profiles, possibly permission denied for folder"
+#: plugins/personal/samba/class_sambaLogonHours.inc:63
+msgid "Monday"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1084
-msgid "Adding environment information failed"
+#: plugins/personal/samba/class_sambaLogonHours.inc:64
+msgid "Tuesday"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1097
-msgid "group share"
+#: plugins/personal/samba/class_sambaLogonHours.inc:65
+msgid "Wednesday"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1129
-msgid "Administrator"
+#: plugins/personal/samba/class_sambaLogonHours.inc:66
+msgid "Thursday"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1134
-msgid "Default printer"
+#: plugins/personal/samba/class_sambaLogonHours.inc:67
+msgid "Friday"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:1
-msgid "Add printer devcies"
+#: plugins/personal/samba/class_sambaLogonHours.inc:68
+msgid "Saturday"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:5
-#: plugins/personal/environment/selectPrinterDialog.tpl:10
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
-msgid "Select printer to add"
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+msgid "Specify the hours this user is allowed to log in"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:43
-msgid "Display printers matching"
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:48
-msgid "Regular expression for matching printer names"
+#: plugins/personal/samba/sambaLogonHours.tpl:90
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:3
@@ -2221,7 +2092,7 @@ msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:133
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
@@ -2244,19 +2115,19 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:238
+#: plugins/personal/connectivity/class_kolabAccount.inc:245
 #: plugins/admin/fai/faiPackage.tpl:72
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
-#: plugins/admin/groups/class_groupMail.inc:562
-#: plugins/admin/applications/class_applicationParameters.inc:106
+#: plugins/admin/groups/class_groupMail.inc:575
+#: plugins/admin/applications/class_applicationParameters.inc:116
 #: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:144
+#: plugins/admin/systems/workstationStartup.tpl:148
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/goSpamServer.tpl:37
 #: plugins/admin/systems/printer.tpl:53
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:400
 #: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -2280,8 +2151,8 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:98
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/gofon/macro/class_divListMacros.inc:74
 msgid "New"
 msgstr ""
 
@@ -2297,24 +2168,221 @@ msgstr ""
 msgid "Toggle admin"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:183
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:186
 msgid "Toggle default"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified name should only consist of uper-/lowercase characters."
+#: plugins/personal/environment/main.inc:125
+msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:104
-msgid "Please specify a valid script name."
+#: plugins/personal/environment/class_hotplugDialog.inc:127
+msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:108
-msgid "Specified description contains invalid characters."
+#: plugins/personal/environment/class_hotplugDialog.inc:130
+msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:8
-msgid "Logon script settings"
+#: plugins/personal/environment/class_hotplugDialog.inc:136
+msgid "Please specify a valid iSerial."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:140
+msgid "Please specify a valid vendor ID. (2 byte hex like '0xFFFF')"
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:143
+msgid "Please specify a valid product ID. (2 byte hex like '0xFFFF')"
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:148
+msgid "An Entry with this name already exists."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:153
+msgid "Please select an entry or press cancel."
+msgstr ""
+
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
+msgid "Please select a printer or press cancel."
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:1
+msgid "Add hotplug devices"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:5
+msgid "Hotplug management"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:10
+msgid "Select hotplug device to add"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:34
+msgid "Choose the department the search will be based    on"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/fai/class_divListFai.inc:75
+#: plugins/admin/groups/group_objects.tpl:46
+#: plugins/admin/users/class_divListUsers.inc:66
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/systems/glpiSelectUser.tpl:35
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Display users matching"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:48
+msgid "Regular expression for        matching hotplugs"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:187
+msgid "auto"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:209
+#: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:96
+#, php-format
+msgid ""
+"You have specified an external resolution hook which can't be read, please "
+"check the permission of the file '%s'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:305
+#: plugins/personal/environment/class_environment.inc:349
+msgid "Remove environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:350
+msgid "Environment extension enabled. You can disable it by clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:320
+#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
+msgid "Add environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:356
+msgid "Environment extension disabled. You can enable it by clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:361
+msgid ""
+"Environment extension disabled. You have to setup a posix account before you "
+"can enable this feature."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:472
+#: plugins/personal/environment/class_environment.inc:805
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+msgid "None"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:556
+#: plugins/personal/environment/class_environment.inc:569
+#: plugins/admin/systems/class_workstationStartup.inc:645
+#: plugins/admin/systems/class_terminalStartup.inc:209
+msgid "You must specify a valid mount point."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:558
+msgid "Spaces are not allowed in the mount path!"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:639
+#: plugins/personal/environment/class_environment.inc:640
+#: plugins/personal/environment/class_environment.inc:648
+#: plugins/personal/environment/class_environment.inc:649
+msgid "Reset password hash"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:654
+msgid "Delete share entry"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:808
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:854
+msgid "Removing environment information failed"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:906
+msgid "Please set a valid profile quota size."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:913
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:951
+msgid "Can't save new kiosk profiles, possibly permission denied for folder"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1100
+msgid "Adding environment information failed"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1113
+msgid "group share"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1145
+msgid "Administrator"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1150
+msgid "Default printer"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
+msgid "Add printer devcies"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:5
+#: plugins/personal/environment/selectPrinterDialog.tpl:10
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
+msgid "Select printer to add"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:43
+msgid "Display printers matching"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:48
+msgid "Regular expression for matching printer names"
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified name should only consist of uper-/lowercase characters."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:104
+msgid "Please specify a valid script name."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:108
+msgid "Specified description contains invalid characters."
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:8
+msgid "Logon script settings"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:10
@@ -2342,7 +2410,7 @@ msgstr ""
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:64
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -2369,24 +2437,6 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr ""
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -2459,7 +2509,7 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/fai/class_faiSummaryTab.inc:219
+#: plugins/admin/fai/class_faiSummaryTab.inc:227
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
@@ -2471,152 +2521,154 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/generic/class_user.inc:261
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/generic/class_user.inc:261
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:272
+#: plugins/personal/generic/class_user.inc:277
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:331
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:422
+#: plugins/personal/generic/class_user.inc:427
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:462
+#: plugins/personal/generic/class_user.inc:467
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:472
+#: plugins/personal/generic/class_user.inc:477
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:475
+#: plugins/personal/generic/class_user.inc:480
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:481
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:480
+#: plugins/personal/generic/class_user.inc:485
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:563
+#: plugins/personal/generic/class_user.inc:568
 msgid "Removing generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:852
-msgid "Saving generic user account failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:600
+#: plugins/personal/generic/class_user.inc:943
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:916
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:960
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:927
-msgid "Can't add user to kerberos database."
+#: plugins/personal/generic/class_user.inc:896
+msgid "Saving generic user account failed"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:971
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1022
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:976
+#: plugins/personal/generic/class_user.inc:1027
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:982
+#: plugins/personal/generic/class_user.inc:1033
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:519
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:991
+#: plugins/personal/generic/class_user.inc:1042
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:1048
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:522
+#: plugins/admin/users/class_userManagement.inc:544
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:1051
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1007
+#: plugins/personal/generic/class_user.inc:1058
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1065
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1068
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1020
-#: plugins/personal/generic/class_user.inc:1045
+#: plugins/personal/generic/class_user.inc:1071
+#: plugins/personal/generic/class_user.inc:1096
 #: plugins/addons/addressbook/class_addressbook.inc:565
 #: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1023
-#: plugins/personal/generic/class_user.inc:1042
+#: plugins/personal/generic/class_user.inc:1074
+#: plugins/personal/generic/class_user.inc:1093
 #: plugins/addons/addressbook/class_addressbook.inc:568
 #: plugins/addons/addressbook/class_addressbook.inc:590
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1079
 #: plugins/addons/addressbook/class_addressbook.inc:573
 #: plugins/addons/addressbook/class_addressbook.inc:576
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1031
+#: plugins/personal/generic/class_user.inc:1082
 #: plugins/addons/addressbook/class_addressbook.inc:579
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1034
+#: plugins/personal/generic/class_user.inc:1085
 #: plugins/addons/addressbook/class_addressbook.inc:582
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1088
 #: plugins/addons/addressbook/class_addressbook.inc:585
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1164
+#: plugins/personal/generic/class_user.inc:1215
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -2692,19 +2744,19 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:88
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
 #: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_divListFai.inc:161
-#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_divListUsers.inc:107
+#: plugins/admin/users/class_divListUsers.inc:99
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:93
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/departments/class_divListDepartment.inc:72
 #: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
 #: plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/systems/component.tpl:13 plugins/admin/systems/phone.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/servservice.tpl:61
@@ -2712,11 +2764,11 @@ msgstr ""
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:102
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:85
+#: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:77
 msgid "Base"
 msgstr ""
 
@@ -3043,11 +3095,11 @@ msgstr ""
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:76
+#: plugins/personal/connectivity/class_webdavAccount.inc:83
 msgid "Removing webDAV account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:119
+#: plugins/personal/connectivity/class_webdavAccount.inc:128
 msgid "Saving webDAV account failed"
 msgstr ""
 
@@ -3140,44 +3192,44 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
+#: plugins/personal/connectivity/class_proxyAccount.inc:95
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
+#: plugins/personal/connectivity/class_proxyAccount.inc:95
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:96
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:96
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:96
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:96
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:164
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Removing proxy account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:180
+#: plugins/personal/connectivity/class_proxyAccount.inc:188
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:183
+#: plugins/personal/connectivity/class_proxyAccount.inc:191
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:270
+#: plugins/personal/connectivity/class_proxyAccount.inc:272
 msgid "Saving proxy account failed"
 msgstr ""
 
@@ -3194,9 +3246,9 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/ogroups/class_termgroup.inc:47
+#: plugins/admin/systems/class_workstationGeneric.inc:111
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/ogroups/class_termgroup.inc:48
 msgid "Locked"
 msgstr ""
 
@@ -3212,11 +3264,11 @@ msgstr ""
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:92
+#: plugins/personal/connectivity/class_pptpAccount.inc:98
 msgid "Removing PPTP account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:135
+#: plugins/personal/connectivity/class_pptpAccount.inc:143
 msgid "Saving PPTP account failed"
 msgstr ""
 
@@ -3224,11 +3276,11 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:109
+#: plugins/personal/connectivity/class_intranetAccount.inc:115
 msgid "Removing intranet account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:164
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
 msgid "Saving intranet account failed"
 msgstr ""
 
@@ -3236,11 +3288,11 @@ msgstr ""
 msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:80
+#: plugins/personal/connectivity/class_phpgwAccount.inc:86
 msgid "Removing PHPgw account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:123
+#: plugins/personal/connectivity/class_phpgwAccount.inc:131
 msgid "Saving PHPgw account failed"
 msgstr ""
 
@@ -3252,65 +3304,65 @@ msgstr ""
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:123
+#: plugins/personal/connectivity/class_kolabAccount.inc:130
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:131
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:158
+#: plugins/personal/connectivity/class_kolabAccount.inc:165
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:159
+#: plugins/personal/connectivity/class_kolabAccount.inc:166
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:160
+#: plugins/personal/connectivity/class_kolabAccount.inc:167
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:161
+#: plugins/personal/connectivity/class_kolabAccount.inc:168
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:162
+#: plugins/personal/connectivity/class_kolabAccount.inc:169
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:212
+#: plugins/personal/connectivity/class_kolabAccount.inc:219
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:280
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:284
+#: plugins/personal/connectivity/class_kolabAccount.inc:291
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:289
+#: plugins/personal/connectivity/class_kolabAccount.inc:296
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:303
+#: plugins/personal/connectivity/class_kolabAccount.inc:310
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:311
+#: plugins/personal/connectivity/class_kolabAccount.inc:318
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:390
+#: plugins/personal/connectivity/class_kolabAccount.inc:398
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr ""
@@ -3320,31 +3372,31 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:104
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:111
 msgid "Removing pureftpd account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:154
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:157
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:160
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:163
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:166
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:183
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:191
 msgid "Saving pureftpd account failed"
 msgstr ""
 
@@ -3352,40 +3404,40 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:822
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:826
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:738
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:836
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:830
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:742
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:840
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:743
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:751
 msgid "Removing of oxchange addressbook failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:751
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:759
 msgid "Removing oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:810
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:843
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:853
 msgid "Saving of oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:850
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:860
 msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
@@ -3393,19 +3445,19 @@ msgstr ""
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:145
+#: plugins/personal/connectivity/class_opengwAccount.inc:153
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:150
+#: plugins/personal/connectivity/class_opengwAccount.inc:158
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:158
+#: plugins/personal/connectivity/class_opengwAccount.inc:166
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3415,11 +3467,11 @@ msgstr ""
 msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:89
 msgid "Removing PHPscheduleit account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:132
 msgid "Saving PHPscheduleit account failed"
 msgstr ""
 
@@ -3440,7 +3492,7 @@ msgid "Select subtree to place blocklist in"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/fai/class_faiSummaryTab.inc:326
+#: plugins/admin/fai/class_faiSummaryTab.inc:334
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
@@ -3451,7 +3503,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:136
 msgid "Type"
 msgstr ""
 
@@ -3505,7 +3557,7 @@ msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:442
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:232
 msgid "Required field 'Name' is not set."
 msgstr ""
 
@@ -3586,218 +3638,102 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:93
-#: plugins/admin/applications/class_divListApplication.inc:92
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_divListSystem.inc:93
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
-msgid "Go to root department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:93
-#: plugins/admin/applications/class_divListApplication.inc:92
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_divListSystem.inc:93
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
-msgid "Root"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/admin/fai/class_divListFai.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:95
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:70
-#: plugins/admin/systems/class_divListSystem.inc:95
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
-msgid "Go up one department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/fai/class_faiProfile.inc:309
-#: plugins/admin/fai/class_divListFai.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:95
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:70
-#: plugins/admin/systems/class_divListSystem.inc:95
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:97
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/systems/class_divListSystem.inc:97
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
-msgid "Go to users department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/fai/class_divListFai.inc:127
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:97
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:71
-#: plugins/admin/systems/class_divListSystem.inc:97
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
-msgid "Home"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/admin/fai/class_divListFai.inc:129
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
-msgid "Reload list"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:130
-#: plugins/admin/fai/class_divListFai.inc:162
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/users/class_divListUsers.inc:109
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/applications/class_divListApplication.inc:106
-#: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_divListSystem.inc:115
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:81
-#: plugins/gofon/conference/class_divListConferences.inc:88
-msgid "Submit"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:162
-#: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:109
-#: plugins/admin/applications/class_divListApplication.inc:106
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/systems/class_divListSystem.inc:115
+#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/groups/class_divListGroup.inc:98
+#: plugins/admin/users/class_divListUsers.inc:101
+#: plugins/admin/applications/class_divListApplication.inc:95
+#: plugins/admin/departments/class_divListDepartment.inc:74
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/ogroups/class_divListOGroup.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:104
+#: plugins/gofon/macro/class_divListMacros.inc:78
+#: plugins/gofon/conference/class_divListConferences.inc:79
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:104
-#: plugins/admin/fai/class_faiScript.inc:248
-#: plugins/admin/fai/class_faiScript.inc:251
-#: plugins/admin/fai/class_faiTemplate.inc:244
-#: plugins/admin/fai/class_faiTemplate.inc:247
-#: plugins/admin/fai/class_faiHook.inc:270
-#: plugins/admin/fai/class_faiHook.inc:273
-#: plugins/admin/fai/class_divListFai.inc:231
-#: plugins/admin/fai/class_divListFai.inc:236
-#: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:159
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/groups/class_divListGroup.inc:98
+#: plugins/admin/users/class_divListUsers.inc:101
+#: plugins/admin/applications/class_divListApplication.inc:95
+#: plugins/admin/departments/class_divListDepartment.inc:74
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:104
+#: plugins/gofon/macro/class_divListMacros.inc:78
+#: plugins/gofon/conference/class_divListConferences.inc:79
+#: include/class_MultiSelectWindow.inc:211
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/admin/fai/class_faiScript.inc:249
+#: plugins/admin/fai/class_faiScript.inc:252
+#: plugins/admin/fai/class_faiTemplate.inc:245
+#: plugins/admin/fai/class_faiTemplate.inc:248
+#: plugins/admin/fai/class_faiHook.inc:271
+#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_divListFai.inc:213
+#: plugins/admin/fai/class_divListFai.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:157
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/applications/class_divListApplication.inc:156
+#: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:143
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_divListOGroup.inc:138
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/ogroups/class_divListOGroup.inc:142
+#: plugins/gofon/macro/class_divListMacros.inc:93
+#: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:104
-#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/admin/users/class_divListUsers.inc:185
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:96
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:252
-#: plugins/admin/fai/class_faiTemplate.inc:248
-#: plugins/admin/fai/class_faiHook.inc:274
-#: plugins/admin/fai/class_divListFai.inc:238
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:164
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_divListSystem.inc:141
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: plugins/admin/fai/class_faiScript.inc:253
+#: plugins/admin/fai/class_faiTemplate.inc:249
+#: plugins/admin/fai/class_faiHook.inc:275
+#: plugins/admin/fai/class_divListFai.inc:220
+#: plugins/admin/groups/class_divListGroup.inc:161
+#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: plugins/gofon/macro/class_divListMacros.inc:95
+#: plugins/gofon/conference/class_divListConferences.inc:96
+#: plugins/gofon/conference/class_divListConferences.inc:98
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/users/class_divListUsers.inc:148
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:96
+#: plugins/admin/users/class_divListUsers.inc:196
 msgid "Delete user"
 msgstr ""
 
@@ -3807,9 +3743,10 @@ msgstr ""
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
 #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:335 html/index.php:341
+#: html/index.php:49 html/index.php:333 html/index.php:339
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
 #: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid "Warning"
@@ -3840,7 +3777,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/admin/ogroups/phonequeue.tpl:48 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -3944,68 +3881,68 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:145
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:154
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:167
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:168
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:157
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:170
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:171
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:226
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:239
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:439
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:521
-#: plugins/admin/groups/class_groupApplication.inc:632
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:452
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:534
+#: plugins/admin/groups/class_groupApplication.inc:643
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
 msgid "back"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:625
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:638
 msgid "Removing FAX account failed"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:657
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:665
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:667
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:673
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:756
 msgid "Saving FAX account failed"
 msgstr ""
 
@@ -4056,7 +3993,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:806
+#: plugins/admin/systems/class_printGeneric.inc:853
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
@@ -4179,7 +4116,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/class_faiSummaryTab.inc:321
+#: plugins/admin/fai/class_faiSummaryTab.inc:329
 #: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
@@ -4187,6 +4124,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/paste_fai_object.tpl:1
 #: plugins/admin/systems/servnfs.tpl:9
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
@@ -4232,7 +4170,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:714
+#: plugins/admin/groups/class_groupApplication.inc:725
 msgid "Edit entry"
 msgstr ""
 
@@ -4493,10 +4431,29 @@ msgstr ""
 msgid "Go up one dfsshare"
 msgstr ""
 
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/fai/class_faiProfile.inc:310
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_servDNSeditZone.inc:295
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: include/class_MultiSelectWindow.inc:196
+#: include/class_MultiSelectWindow.inc:198
+msgid "Up"
+msgstr ""
+
 #: plugins/addons/godfs/class_dfsManagment.inc:214
 msgid "Go to dfs root"
 msgstr ""
 
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: include/class_MultiSelectWindow.inc:188
+#: include/class_MultiSelectWindow.inc:190
+msgid "Root"
+msgstr ""
+
 #: plugins/addons/godfs/class_dfsManagment.inc:215
 msgid "Create new dfsshare"
 msgstr ""
@@ -5011,36 +4968,36 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:261
-#: plugins/admin/fai/class_faiTemplate.inc:260
+#: plugins/admin/fai/class_faiScript.inc:262
+#: plugins/admin/fai/class_faiTemplate.inc:261
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:283
+#: plugins/admin/fai/class_faiHook.inc:284
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:323
+#: plugins/admin/fai/class_faiScript.inc:324
 msgid "Removing FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:359
-#: plugins/admin/fai/class_faiProfile.inc:400
+#: plugins/admin/fai/class_faiScript.inc:360
+#: plugins/admin/fai/class_faiProfile.inc:401
 #, php-format
 msgid ""
 "Can't insert a script named '%s' in '%s' there is already a script with the "
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:392
+#: plugins/admin/fai/class_faiScript.inc:393
 msgid "Creating FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:476
+#: plugins/admin/fai/class_faiScript.inc:477
 msgid "Removing FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:495
+#: plugins/admin/fai/class_faiScript.inc:496
 msgid "Saving FAI script failed"
 msgstr ""
 
@@ -5052,24 +5009,27 @@ msgstr ""
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:356
+#: plugins/admin/fai/class_faiTemplate.inc:357
 #, php-format
 msgid ""
 "Can't insert a fai template named '%s' in '%s' there is already a template "
 "with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:389
+#: plugins/admin/fai/class_faiTemplate.inc:390
 msgid "Saving FAI template base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:467
-msgid "Removing FAI template base failed"
+#: plugins/admin/fai/class_faiTemplate.inc:468
+msgid "Removing FAI template entry failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:473
+msgid "Modifying FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:472
-#: plugins/admin/fai/class_faiTemplate.inc:485
-msgid "Saving FAI template failed"
+#: plugins/admin/fai/class_faiTemplate.inc:486
+msgid "Creating FAI template entry failed"
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:32
@@ -5086,40 +5046,40 @@ msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:185
-#: plugins/admin/fai/class_faiManagement.inc:229
-#: plugins/admin/systems/class_systemManagement.inc:385
-#: plugins/admin/systems/class_systemManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:231
+#: plugins/admin/systems/class_systemManagement.inc:407
+#: plugins/admin/systems/class_systemManagement.inc:467
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:284
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:285
+#: plugins/admin/fai/class_faiManagement.inc:287
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:341
+#: plugins/admin/fai/class_faiManagement.inc:345
 msgid "Specified branch name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:343
+#: plugins/admin/fai/class_faiManagement.inc:347
 msgid "Specified freeze name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:350
-#: plugins/admin/systems/class_servRepository.inc:212
+#: plugins/admin/fai/class_faiManagement.inc:354
+#: plugins/admin/systems/class_servRepository.inc:245
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
 msgid "This name is already in use."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:420
-#: plugins/admin/fai/class_faiManagement.inc:574
-#: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:597
+#: plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:431
+#: plugins/admin/departments/class_departmentGeneric.inc:523
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
@@ -5238,7 +5198,7 @@ msgstr ""
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
-#: plugins/admin/systems/servRepository.tpl:46
+#: plugins/admin/systems/servRepository.tpl:48
 #: plugins/admin/ogroups/ogroup_objects.tpl:45
 msgid "Display objects matching"
 msgstr ""
@@ -5246,7 +5206,7 @@ msgstr ""
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
-#: plugins/admin/systems/servRepository.tpl:50
+#: plugins/admin/systems/servRepository.tpl:52
 #: plugins/admin/ogroups/ogroup_objects.tpl:46
 msgid "Regular expression for matching object names"
 msgstr ""
@@ -5260,7 +5220,7 @@ msgid "Scripts"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:304
 #: plugins/admin/fai/class_faiProfileEntry.inc:144
 msgid "Partition table"
 msgstr ""
@@ -5269,33 +5229,38 @@ msgstr ""
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:201
+#: plugins/admin/fai/class_faiSummaryTab.inc:170
+#: plugins/admin/systems/class_servRepository.inc:91
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:209
 msgid "This object has no FAI classes assigned."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:213
+#: plugins/admin/fai/class_faiSummaryTab.inc:221
 msgid "Open"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:320
+#: plugins/admin/fai/class_faiSummaryTab.inc:328
 msgid "No."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:322
+#: plugins/admin/fai/class_faiSummaryTab.inc:330
 msgid "FS options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:323
+#: plugins/admin/fai/class_faiSummaryTab.inc:331
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:209
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:324
+#: plugins/admin/fai/class_faiSummaryTab.inc:332
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:208
 msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:325
+#: plugins/admin/fai/class_faiSummaryTab.inc:333
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:207
 msgid "Mount point"
 msgstr ""
@@ -5346,51 +5311,50 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:350
+#: plugins/admin/fai/class_faiPackage.inc:342
 msgid "Removing FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:379
+#: plugins/admin/fai/class_faiPackage.inc:371
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:383
+#: plugins/admin/fai/class_faiPackage.inc:375
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:396
+#: plugins/admin/fai/class_faiPackage.inc:388
 #, php-format
 msgid ""
 "Can't insert a fai package list named '%s' in '%s' there is already a "
 "package list with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:418
+#: plugins/admin/fai/class_faiPackage.inc:410
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:424
+#: plugins/admin/fai/class_faiPackage.inc:416
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:449
+#: plugins/admin/fai/class_faiPackage.inc:442
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:513
+#: plugins/admin/fai/class_faiPackage.inc:506
 msgid "Saving FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:558
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Saving FAI package entry failed"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
-#: plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/workstationStartup.tpl:45
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/class_servRepository.inc:252
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/systems/workstationStartup.tpl:47
+#: plugins/admin/systems/workstationStartup.tpl:77
+#: plugins/admin/systems/class_servRepository.inc:285
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 msgid "Release"
 msgstr ""
@@ -5420,86 +5384,86 @@ msgstr ""
 msgid "Toggle remove flag"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:350
+#: plugins/admin/fai/class_faiHook.inc:351
 msgid "Removing FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:386
+#: plugins/admin/fai/class_faiHook.inc:387
 #, php-format
 msgid ""
 "Can't insert a fai hook named '%s' in '%s' there is already a hook with the "
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:419
+#: plugins/admin/fai/class_faiHook.inc:420
 msgid "Saving FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:509
+#: plugins/admin/fai/class_faiHook.inc:510
 msgid "Removing FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:515
-#: plugins/admin/fai/class_faiHook.inc:525
+#: plugins/admin/fai/class_faiHook.inc:516
+#: plugins/admin/fai/class_faiHook.inc:526
 msgid "Saving FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:296
 #: plugins/admin/fai/class_faiProfileEntry.inc:172
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:298
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_faiProfile.inc:300
 #: plugins/admin/fai/class_faiProfileEntry.inc:140
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:301
 #: plugins/admin/fai/class_faiProfileEntry.inc:141
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:301
+#: plugins/admin/fai/class_faiProfile.inc:302
 #: plugins/admin/fai/class_faiProfileEntry.inc:142
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:302
+#: plugins/admin/fai/class_faiProfile.inc:303
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:306
+#: plugins/admin/fai/class_faiProfile.inc:307
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:310
-#: plugins/admin/systems/class_servDNSeditZone.inc:290
-#: plugins/admin/ogroups/phonequeue.tpl:18
+#: plugins/admin/fai/class_faiProfile.inc:311
+#: plugins/admin/systems/class_servDNSeditZone.inc:296
+#: plugins/admin/ogroups/phonequeue.tpl:22
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:365
+#: plugins/admin/fai/class_faiProfile.inc:366
 msgid "Removing FAI profile failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:405
+#: plugins/admin/fai/class_faiProfile.inc:406
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:409
+#: plugins/admin/fai/class_faiProfile.inc:410
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:424
+#: plugins/admin/fai/class_faiProfile.inc:425
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:463
+#: plugins/admin/fai/class_faiProfile.inc:464
 msgid "Saving FAI profile failed"
 msgstr ""
 
@@ -5587,48 +5551,6 @@ msgstr ""
 msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
-msgid "Repository settings"
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:26
-msgid "please choose a release..."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:37
-msgid "Sections for this release"
-msgstr ""
-
 #: plugins/admin/fai/class_faiVariableEntry.inc:98
 msgid "Please specify a value for the attribute 'content'."
 msgstr ""
@@ -5780,106 +5702,101 @@ msgstr ""
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:127
-#: plugins/admin/departments/class_divListDepartment.inc:71
-msgid "Go to users home department"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:135
+#: plugins/admin/fai/class_divListFai.inc:117
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:135
+#: plugins/admin/fai/class_divListFai.inc:117
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:140
+#: plugins/admin/fai/class_divListFai.inc:122
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:140
+#: plugins/admin/fai/class_divListFai.inc:122
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:125
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:125
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:128
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:128
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:152
+#: plugins/admin/fai/class_divListFai.inc:134
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:152
+#: plugins/admin/fai/class_divListFai.inc:134
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/fai/class_divListFai.inc:137
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/fai/class_divListFai.inc:137
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:224
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:153
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#: plugins/admin/fai/class_divListFai.inc:206
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:224
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:153
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#: plugins/admin/fai/class_divListFai.inc:206
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:227
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:155
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
+#: plugins/admin/fai/class_divListFai.inc:209
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:227
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:155
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
+#: plugins/admin/fai/class_divListFai.inc:209
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:232
-#: plugins/admin/fai/class_divListFai.inc:237
+#: plugins/admin/fai/class_divListFai.inc:214
+#: plugins/admin/fai/class_divListFai.inc:219
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:221
 msgid "Delete class"
 msgstr ""
 
@@ -5887,44 +5804,44 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:274
-#: plugins/admin/fai/class_faiPartitionTable.inc:280
+#: plugins/admin/fai/class_faiPartitionTable.inc:275
+#: plugins/admin/fai/class_faiPartitionTable.inc:281
 #, php-format
 msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:276
-#: plugins/admin/fai/class_faiPartitionTable.inc:282
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
+#: plugins/admin/fai/class_faiPartitionTable.inc:283
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:334
+#: plugins/admin/fai/class_faiPartitionTable.inc:335
 #, php-format
 msgid ""
 "Can't insert a new fai partition table named '%s' in '%s' there is already "
 "one defined with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:371
+#: plugins/admin/fai/class_faiPartitionTable.inc:372
 msgid "Saving FAI partition table base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:418
+#: plugins/admin/fai/class_faiPartitionTable.inc:419
 msgid "Removing FAI partition table failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:426
-#: plugins/admin/fai/class_faiPartitionTable.inc:435
+#: plugins/admin/fai/class_faiPartitionTable.inc:427
+#: plugins/admin/fai/class_faiPartitionTable.inc:436
 msgid "Saving FAI partition table failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:504
+#: plugins/admin/fai/class_faiPartitionTable.inc:505
 msgid "Removing FAI partition table entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:525
-#: plugins/admin/fai/class_faiPartitionTable.inc:536
+#: plugins/admin/fai/class_faiPartitionTable.inc:526
+#: plugins/admin/fai/class_faiPartitionTable.inc:537
 msgid "Saving FAI partition table entry failed"
 msgstr ""
 
@@ -5958,23 +5875,23 @@ msgstr ""
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:284
+#: plugins/admin/fai/class_faiVariable.inc:285
 #, php-format
 msgid ""
 "Can't insert a fai variable named '%s' in '%s' there is already a variable "
 "with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:317
+#: plugins/admin/fai/class_faiVariable.inc:318
 msgid "Saving FAI variable base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:383
+#: plugins/admin/fai/class_faiVariable.inc:384
 msgid "Removing FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:390
-#: plugins/admin/fai/class_faiVariable.inc:402
+#: plugins/admin/fai/class_faiVariable.inc:391
+#: plugins/admin/fai/class_faiVariable.inc:403
 msgid "Saving FAI variable failed"
 msgstr ""
 
@@ -6010,11 +5927,15 @@ msgstr ""
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:142
+#: plugins/admin/fai/class_askClassName.inc:143
+msgid "Spaces are not allowed within class names."
+msgstr ""
+
+#: plugins/admin/fai/class_askClassName.inc:147
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:146
+#: plugins/admin/fai/class_askClassName.inc:151
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -6104,7 +6025,7 @@ msgid "Template attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:29
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:130
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:136
 msgid "File"
 msgstr ""
 
@@ -6130,8 +6051,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:801
-#: plugins/admin/systems/class_printGeneric.inc:803
+#: plugins/admin/systems/class_printGeneric.inc:848
+#: plugins/admin/systems/class_printGeneric.inc:850
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -6142,7 +6063,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:161
+#: plugins/admin/systems/class_servDNS.inc:169
 msgid "Class"
 msgstr ""
 
@@ -6156,8 +6077,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
-#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/terminal.tpl:128 plugins/admin/systems/server.tpl:61
+#: plugins/admin/systems/workstation.tpl:107
 #: plugins/admin/ogroups/termgroup.tpl:85
 msgid "Execute"
 msgstr ""
@@ -6182,6 +6103,10 @@ msgstr ""
 msgid "sticky"
 msgstr ""
 
+#: plugins/admin/fai/paste_fai_object.tpl:1
+msgid "Enter FAI object name"
+msgstr ""
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr ""
@@ -6241,87 +6166,93 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:244
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/ogroups/class_ogroupManagement.inc:137
+msgid "You are not allowed to execute this method!"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:261
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:250
-#: plugins/admin/groups/class_groupManagement.inc:281
+#: plugins/admin/groups/class_groupManagement.inc:267
+#: plugins/admin/groups/class_groupManagement.inc:298
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:123
+#: plugins/admin/groups/class_groupGeneric.inc:125
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
+#: plugins/admin/groups/class_groupGeneric.inc:181
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:319
+#: plugins/admin/groups/class_groupGeneric.inc:321
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:319
+#: plugins/admin/groups/class_groupGeneric.inc:321
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:319
+#: plugins/admin/groups/class_groupGeneric.inc:321
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:320
+#: plugins/admin/groups/class_groupGeneric.inc:322
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:325
+#: plugins/admin/groups/class_groupGeneric.inc:327
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:437
+#: plugins/admin/groups/class_groupGeneric.inc:439
 msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:480
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:507
+#: plugins/admin/groups/class_groupGeneric.inc:509
 msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:614
+#: plugins/admin/groups/class_groupGeneric.inc:616
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:619
+#: plugins/admin/groups/class_groupGeneric.inc:621
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:704
+#: plugins/admin/groups/class_groupGeneric.inc:706
 msgid "Saving group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:733
-#: plugins/admin/ogroups/class_ogroup.inc:613
+#: plugins/admin/groups/class_groupGeneric.inc:735
+#: plugins/admin/ogroups/class_ogroup.inc:611
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:743
+#: plugins/admin/groups/class_groupGeneric.inc:745
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:755
-#: plugins/admin/groups/class_groupGeneric.inc:769
-#: plugins/admin/groups/class_groupGeneric.inc:776
+#: plugins/admin/groups/class_groupGeneric.inc:757
+#: plugins/admin/groups/class_groupGeneric.inc:771
+#: plugins/admin/groups/class_groupGeneric.inc:778
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -6381,42 +6312,42 @@ msgstr ""
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:98
+#: plugins/admin/groups/class_divListGroup.inc:93
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:126
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:121
+#: plugins/admin/users/class_divListUsers.inc:139
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:132
-#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/groups/class_divListGroup.inc:127
+#: plugins/admin/applications/class_divListApplication.inc:119
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:159
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/ogroups/class_divListOGroup.inc:138
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/groups/class_divListGroup.inc:157
+#: plugins/admin/applications/class_divListApplication.inc:156
+#: plugins/admin/departments/class_divListDepartment.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:142
+#: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:164
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: plugins/admin/groups/class_divListGroup.inc:161
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:96
+#: plugins/gofon/conference/class_divListConferences.inc:98
 msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:503
 #: include/class_ldap.inc:463
 msgid "Object"
 msgstr ""
@@ -6438,72 +6369,72 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:292
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:293
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:294
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288
+#: plugins/admin/groups/class_groupMail.inc:295
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:289
+#: plugins/admin/groups/class_groupMail.inc:296
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:315
+#: plugins/admin/groups/class_groupMail.inc:328
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:339
+#: plugins/admin/groups/class_groupMail.inc:352
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:340
+#: plugins/admin/groups/class_groupMail.inc:353
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:395
+#: plugins/admin/groups/class_groupMail.inc:408
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:396
+#: plugins/admin/groups/class_groupMail.inc:409
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:632
+#: plugins/admin/groups/class_groupMail.inc:645
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:806
+#: plugins/admin/groups/class_groupMail.inc:819
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:835
+#: plugins/admin/groups/class_groupMail.inc:848
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:868
+#: plugins/admin/groups/class_groupMail.inc:881
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:872
+#: plugins/admin/groups/class_groupMail.inc:885
 msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/class_ogroup.inc:694
+#: plugins/admin/ogroups/paste_generic.tpl:4
 msgid "Group name"
 msgstr ""
 
@@ -6581,19 +6512,23 @@ msgstr ""
 msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:59
+#: plugins/admin/groups/class_groupAcl.inc:57
+msgid "You have no permissions to view and edit ACLs."
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:68
 msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:100
+#: plugins/admin/groups/class_groupAcl.inc:109
 msgid "Removing ACL information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:196
+#: plugins/admin/groups/class_groupAcl.inc:212
 msgid "Saving ACL information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:206
+#: plugins/admin/groups/class_groupAcl.inc:222
 msgid "All fields are writeable"
 msgstr ""
 
@@ -6609,100 +6544,100 @@ msgstr ""
 msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:393
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:401
+#: plugins/admin/groups/class_groupApplication.inc:409
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:402
+#: plugins/admin/groups/class_groupApplication.inc:410
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:412
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:405
+#: plugins/admin/groups/class_groupApplication.inc:413
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:417
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:425
+#: plugins/admin/groups/class_groupApplication.inc:433
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:520
+#: plugins/admin/groups/class_groupApplication.inc:528
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:556
+#: plugins/admin/groups/class_groupApplication.inc:564
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:638
-#: plugins/admin/departments/class_divListDepartment.inc:112
+#: plugins/admin/groups/class_groupApplication.inc:649
+#: plugins/admin/departments/class_divListDepartment.inc:118
 msgid "department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:646
+#: plugins/admin/groups/class_groupApplication.inc:657
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:677
-#: plugins/admin/groups/class_groupApplication.inc:713
+#: plugins/admin/groups/class_groupApplication.inc:688
+#: plugins/admin/groups/class_groupApplication.inc:724
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:681
-#: plugins/admin/groups/class_groupApplication.inc:711
+#: plugins/admin/groups/class_groupApplication.inc:692
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/groups/class_groupApplication.inc:712
+#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:709
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:737
+#: plugins/admin/groups/class_groupApplication.inc:748
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:740
+#: plugins/admin/groups/class_groupApplication.inc:751
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:744
+#: plugins/admin/groups/class_groupApplication.inc:755
 msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:746
+#: plugins/admin/groups/class_groupApplication.inc:757
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:838
+#: plugins/admin/groups/class_groupApplication.inc:849
 msgid "Removing application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:883
+#: plugins/admin/groups/class_groupApplication.inc:894
 msgid "Saving application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:926
+#: plugins/admin/groups/class_groupApplication.inc:937
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -6725,34 +6660,34 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
+#: plugins/admin/systems/printer.tpl:72 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:199
-#: plugins/admin/users/class_userManagement.inc:275
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:297
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:314
+#: plugins/admin/users/class_userManagement.inc:336
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:320
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:342
+#: plugins/admin/users/class_userManagement.inc:369
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:453
+#: plugins/admin/users/class_userManagement.inc:475
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:281
+#: plugins/admin/ogroups/class_ogroup.inc:280
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:553
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -6768,7 +6703,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:835
+#: plugins/admin/systems/class_systemManagement.inc:863
 msgid "Template"
 msgstr ""
 
@@ -6841,76 +6776,68 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/users/class_divListUsers.inc:94
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/users/class_divListUsers.inc:94
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/users/class_divListUsers.inc:96
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/users/class_divListUsers.inc:96
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:145
-msgid "password"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:160
+#: plugins/admin/users/class_divListUsers.inc:137
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:161
+#: plugins/admin/users/class_divListUsers.inc:138
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:163
+#: plugins/admin/users/class_divListUsers.inc:140
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/users/class_divListUsers.inc:142
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/users/class_divListUsers.inc:144
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/users/class_divListUsers.inc:146
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:171
+#: plugins/admin/users/class_divListUsers.inc:148
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:173
+#: plugins/admin/users/class_divListUsers.inc:150
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:175
+#: plugins/admin/users/class_divListUsers.inc:152
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:176
+#: plugins/admin/users/class_divListUsers.inc:153
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:154
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:230
-msgid "Online"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:237
-msgid "Offline"
+#: plugins/admin/users/class_divListUsers.inc:189
+msgid "password"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -6985,55 +6912,55 @@ msgid ""
 "working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#: plugins/admin/applications/class_divListApplication.inc:89
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/applications/class_divListApplication.inc:90
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
+#: plugins/admin/applications/class_applicationParameters.inc:59
 msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:53
+#: plugins/admin/applications/class_applicationParameters.inc:60
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
+#: plugins/admin/applications/class_applicationParameters.inc:62
 msgid "Create options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:56
+#: plugins/admin/applications/class_applicationParameters.inc:63
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:99
+#: plugins/admin/applications/class_applicationParameters.inc:109
 msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:99
+#: plugins/admin/applications/class_applicationParameters.inc:109
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:112
+#: plugins/admin/applications/class_applicationParameters.inc:122
 msgid "Add option"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:137
+#: plugins/admin/applications/class_applicationParameters.inc:147
 msgid "Removing application parameters failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:168
+#: plugins/admin/applications/class_applicationParameters.inc:180
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:199
+#: plugins/admin/applications/class_applicationParameters.inc:211
 msgid "Saving applications parameters failed"
 msgstr ""
 
@@ -7117,6 +7044,13 @@ msgstr ""
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -7126,7 +7060,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:69
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -7139,7 +7073,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:135
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -7187,17 +7121,10 @@ msgstr ""
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:74
+#: plugins/admin/departments/class_divListDepartment.inc:70
 msgid "Create new department"
 msgstr ""
 
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 msgid ""
@@ -7214,44 +7141,44 @@ msgstr ""
 msgid "Removing department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:218
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
-#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:225
+#: plugins/admin/departments/class_departmentGeneric.inc:227
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:239
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:285
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:330
 msgid "Saving department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:470
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:506
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
@@ -7273,7 +7200,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:339
+#: plugins/admin/departments/class_departmentManagement.inc:338
 msgid ".."
 msgstr ""
 
@@ -7293,21 +7220,27 @@ msgstr ""
 msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:41
+#: plugins/admin/systems/network.tpl:42
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:50
+#: plugins/admin/systems/network.tpl:43
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:76
+msgid "Refresh"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:51
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/network.tpl:59
 #: plugins/admin/systems/servdnseditzone.tpl:85
-#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/class_servDNS.inc:168
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:63
+#: plugins/admin/systems/network.tpl:64
 msgid "Dns records"
 msgstr ""
 
@@ -7318,10 +7251,10 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
 #: plugins/admin/systems/class_workstationService.inc:252
-#: plugins/admin/systems/class_workstationStartup.inc:486
-#: plugins/admin/systems/class_terminalService.inc:254
-#: plugins/admin/systems/class_terminalStartup.inc:165
-#: plugins/admin/systems/class_terminalGeneric.inc:230
+#: plugins/admin/systems/class_workstationStartup.inc:517
+#: plugins/admin/systems/class_terminalService.inc:260
+#: plugins/admin/systems/class_terminalStartup.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:241
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -7632,16 +7565,16 @@ msgstr ""
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:115 plugins/admin/systems/server.tpl:50
-#: plugins/admin/systems/workstation.tpl:93
+#: plugins/admin/systems/terminal.tpl:118 plugins/admin/systems/server.tpl:51
+#: plugins/admin/systems/workstation.tpl:97
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:119
-#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/systems/terminal.tpl:122
+#: plugins/admin/systems/workstation.tpl:101
 #: plugins/admin/ogroups/termgroup.tpl:79
 msgid "Select action to execute for this terminal"
 msgstr ""
@@ -7650,7 +7583,7 @@ msgstr ""
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:54
+#: plugins/admin/systems/server.tpl:55
 msgid "Select action to execute for this server"
 msgstr ""
 
@@ -7676,7 +7609,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:92
 #: plugins/admin/systems/workstationService.tpl:121
-#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:70
 msgid "unknown"
 msgstr ""
 
@@ -7684,35 +7617,35 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:96
 #: plugins/admin/systems/class_workstationService.inc:97
 #: plugins/admin/systems/class_workstationService.inc:98
-#: plugins/admin/systems/class_terminalService.inc:101
 #: plugins/admin/systems/class_terminalService.inc:102
 #: plugins/admin/systems/class_terminalService.inc:103
 #: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
 msgid "bit"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:138
-#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_terminalService.inc:157
 msgid "show chooser"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:139
-#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_terminalService.inc:158
 msgid "direct"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:142
-#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_terminalService.inc:161
 msgid "load balanced"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:145
-#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_terminalService.inc:164
 msgid "Windows RDP"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:146
-#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_terminalService.inc:165
 msgid "ICA client"
 msgstr ""
 
@@ -7730,53 +7663,53 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:233
 #: plugins/admin/systems/class_workstationService.inc:234
 #: plugins/admin/systems/class_workstationService.inc:235
-#: plugins/admin/systems/class_workstationStartup.inc:292
-#: plugins/admin/systems/class_workstationStartup.inc:296
-#: plugins/admin/systems/class_workstationStartup.inc:792
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_workstationStartup.inc:323
+#: plugins/admin/systems/class_workstationStartup.inc:327
+#: plugins/admin/systems/class_workstationStartup.inc:831
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/systems/class_terminalService.inc:73
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:107
 #: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:216
-#: plugins/admin/systems/class_terminalService.inc:219
-#: plugins/admin/systems/class_terminalService.inc:222
-#: plugins/admin/systems/class_terminalService.inc:225
-#: plugins/admin/systems/class_terminalService.inc:228
-#: plugins/admin/systems/class_terminalService.inc:231
-#: plugins/admin/systems/class_terminalService.inc:234
-#: plugins/admin/systems/class_terminalStartup.inc:122
-#: plugins/admin/systems/class_terminalStartup.inc:142
-#: plugins/admin/systems/class_terminalStartup.inc:145
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:280
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:120
+#: plugins/admin/systems/class_terminalService.inc:124
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_terminalService.inc:235
+#: plugins/admin/systems/class_terminalStartup.inc:124
+#: plugins/admin/systems/class_terminalStartup.inc:144
+#: plugins/admin/systems/class_terminalStartup.inc:147
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:292
 msgid "inherited"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:204
-#: plugins/admin/systems/class_terminalService.inc:219
+#: plugins/admin/systems/class_terminalService.inc:220
 msgid "Bit"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:302
-#: plugins/admin/systems/class_terminalService.inc:305
+#: plugins/admin/systems/class_terminalService.inc:311
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:370
 #: plugins/admin/systems/class_workstationService.inc:375
-#: plugins/admin/systems/class_terminalService.inc:367
-#: plugins/admin/systems/class_terminalService.inc:372
+#: plugins/admin/systems/class_terminalService.inc:395
+#: plugins/admin/systems/class_terminalService.inc:400
 msgid "Please specify a valid VSync range."
 msgstr ""
 
 #: plugins/admin/systems/class_workstationService.inc:385
 #: plugins/admin/systems/class_workstationService.inc:390
-#: plugins/admin/systems/class_terminalService.inc:382
-#: plugins/admin/systems/class_terminalService.inc:387
+#: plugins/admin/systems/class_terminalService.inc:410
+#: plugins/admin/systems/class_terminalService.inc:415
 msgid "Please specify a valid HSync range."
 msgstr ""
 
@@ -7791,7 +7724,7 @@ msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/terminalService.tpl:215
 #: plugins/admin/systems/printerPPDDialog.tpl:5
 msgid "Model"
 msgstr ""
@@ -7888,80 +7821,81 @@ msgid "Display device"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:125
+#: plugins/admin/systems/terminalService.tpl:125
 msgid "Use DDC for automatic detection"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:128
-#: plugins/admin/systems/terminalService.tpl:124
+#: plugins/admin/systems/terminalService.tpl:129
 msgid "HSync"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:126
+#: plugins/admin/systems/terminalService.tpl:131
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:133
-#: plugins/admin/systems/terminalService.tpl:129
+#: plugins/admin/systems/terminalService.tpl:134
 msgid "VSync"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:131
+#: plugins/admin/systems/terminalService.tpl:136
 msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:147
-#: plugins/admin/systems/terminalService.tpl:203
+#: plugins/admin/systems/terminalService.tpl:208
 msgid "Scan device"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:148
-#: plugins/admin/systems/terminalService.tpl:204
+#: plugins/admin/systems/terminalService.tpl:209
 msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:205
+#: plugins/admin/systems/terminalService.tpl:210
 msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:317
-#: plugins/admin/systems/class_terminalStartup.inc:91
+#: plugins/admin/systems/class_workstationStartup.inc:348
+#: plugins/admin/systems/class_terminalStartup.inc:93
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:421
+#: plugins/admin/systems/class_workstationStartup.inc:452
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:466
+#: plugins/admin/systems/class_workstationStartup.inc:497
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:524
+#: plugins/admin/systems/class_workstationStartup.inc:557
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:713
+#: plugins/admin/systems/class_workstationStartup.inc:751
 msgid "Not available in current setup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:864
+#: plugins/admin/systems/class_workstationStartup.inc:903
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:877
+#: plugins/admin/systems/class_workstationStartup.inc:916
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -7969,17 +7903,17 @@ msgid ""
 "reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1037
+#: plugins/admin/systems/class_workstationStartup.inc:1087
 msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1087
+#: plugins/admin/systems/class_workstationStartup.inc:1137
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1089
+#: plugins/admin/systems/class_workstationStartup.inc:1139
 #: plugins/admin/systems/class_servRepositorySetup.inc:189
 #, php-format
 msgid ""
@@ -8064,7 +7998,23 @@ msgstr ""
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
@@ -8109,31 +8059,31 @@ msgstr ""
 msgid "LDAP server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:41
-#: plugins/admin/systems/workstationStartup.tpl:71
+#: plugins/admin/systems/workstationStartup.tpl:43
+#: plugins/admin/systems/workstationStartup.tpl:73
 msgid "FAI server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:63
-#: plugins/admin/systems/workstationStartup.tpl:95
+#: plugins/admin/systems/workstationStartup.tpl:65
+#: plugins/admin/systems/workstationStartup.tpl:97
 msgid "Assigned FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:85
+#: plugins/admin/systems/workstationStartup.tpl:87
 msgid "set"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:116
+#: plugins/admin/systems/workstationStartup.tpl:119
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:118
+#: plugins/admin/systems/workstationStartup.tpl:121
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/workstationStartup.tpl:146
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr ""
@@ -8170,50 +8120,50 @@ msgstr ""
 msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:208
+#: plugins/admin/systems/class_glpiAccount.inc:574
 msgid "Remove inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:209
 msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:211
+#: plugins/admin/systems/class_glpiAccount.inc:577
 msgid "Add inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:212
 msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:235
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:273
 #, php-format
 msgid ""
 "Can't rename given printer type to '%s', because this type name already "
 "exists."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:287
 #, php-format
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
-#: plugins/admin/systems/class_glpiAccount.inc:633
-#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:620
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:635
+#: plugins/admin/systems/class_glpiAccount.inc:642
+#: plugins/admin/systems/class_glpiAccount.inc:657
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:760
 msgid "since"
 msgstr ""
 
@@ -8222,134 +8172,134 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/ogroups/class_termgroup.inc:46
+#: plugins/admin/systems/class_workstationGeneric.inc:110
+#: plugins/admin/systems/class_servGeneric.inc:51
+#: plugins/admin/ogroups/class_termgroup.inc:47
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:140
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/ogroups/class_termgroup.inc:211
+#: plugins/admin/systems/class_workstationGeneric.inc:149
+#: plugins/admin/systems/class_servGeneric.inc:85
+#: plugins/admin/ogroups/class_termgroup.inc:212
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:144
-#: plugins/admin/systems/class_terminalGeneric.inc:171
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_servGeneric.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:215
+#: plugins/admin/systems/class_workstationGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:182
+#: plugins/admin/systems/class_terminalGeneric.inc:194
+#: plugins/admin/systems/class_terminalGeneric.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/ogroups/class_termgroup.inc:216
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:184
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:239
-#: plugins/admin/systems/class_terminalGeneric.inc:262
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:261
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_terminalGeneric.inc:274
+#: plugins/admin/systems/class_servGeneric.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:262
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:239
-#: plugins/admin/systems/class_terminalGeneric.inc:263
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:262
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_servGeneric.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:263
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:240
-#: plugins/admin/systems/class_servGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:263
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/systems/class_servGeneric.inc:175
+#: plugins/admin/ogroups/class_termgroup.inc:264
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:241
-#: plugins/admin/systems/class_workstationGeneric.inc:249
-#: plugins/admin/systems/class_servGeneric.inc:163
-#: plugins/admin/systems/class_servGeneric.inc:171
-#: plugins/admin/ogroups/class_termgroup.inc:264
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/systems/class_workstationGeneric.inc:264
+#: plugins/admin/systems/class_servGeneric.inc:176
+#: plugins/admin/systems/class_servGeneric.inc:184
+#: plugins/admin/ogroups/class_termgroup.inc:265
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_workstationGeneric.inc:248
-#: plugins/admin/systems/class_servGeneric.inc:164
-#: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/ogroups/class_termgroup.inc:265
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/systems/class_workstationGeneric.inc:263
+#: plugins/admin/systems/class_servGeneric.inc:177
+#: plugins/admin/systems/class_servGeneric.inc:183
+#: plugins/admin/ogroups/class_termgroup.inc:266
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:243
-#: plugins/admin/systems/class_servGeneric.inc:165
-#: plugins/admin/ogroups/class_termgroup.inc:266
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/systems/class_servGeneric.inc:178
+#: plugins/admin/ogroups/class_termgroup.inc:267
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:244
-#: plugins/admin/systems/class_workstationGeneric.inc:250
-#: plugins/admin/systems/class_terminalGeneric.inc:264
-#: plugins/admin/systems/class_terminalGeneric.inc:268
-#: plugins/admin/systems/class_servGeneric.inc:166
-#: plugins/admin/systems/class_servGeneric.inc:172
-#: plugins/admin/ogroups/class_termgroup.inc:48
+#: plugins/admin/systems/class_workstationGeneric.inc:259
+#: plugins/admin/systems/class_workstationGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:276
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+#: plugins/admin/systems/class_servGeneric.inc:179
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/ogroups/class_termgroup.inc:49
 msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_terminalGeneric.inc:265
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-#: plugins/admin/systems/class_servGeneric.inc:167
-#: plugins/admin/systems/class_servGeneric.inc:173
-#: plugins/admin/ogroups/class_termgroup.inc:49
+#: plugins/admin/systems/class_workstationGeneric.inc:260
+#: plugins/admin/systems/class_workstationGeneric.inc:266
+#: plugins/admin/systems/class_terminalGeneric.inc:277
+#: plugins/admin/systems/class_terminalGeneric.inc:281
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/ogroups/class_termgroup.inc:50
 msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:247
-#: plugins/admin/systems/class_terminalGeneric.inc:267
-#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:262
+#: plugins/admin/systems/class_terminalGeneric.inc:279
+#: plugins/admin/systems/class_servGeneric.inc:182
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:279
+#: plugins/admin/systems/class_workstationGeneric.inc:297
 msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:330
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:350
+#: plugins/admin/ogroups/class_termgroup.inc:115
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:334
+#: plugins/admin/systems/class_workstationGeneric.inc:354
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:347
-#: plugins/admin/systems/class_componentGeneric.inc:165
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:388
-#: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:642
-#: plugins/admin/systems/class_phoneGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:372
+#: plugins/admin/systems/class_componentGeneric.inc:171
+#: plugins/admin/systems/class_winGeneric.inc:180
+#: plugins/admin/systems/class_terminalGeneric.inc:414
+#: plugins/admin/systems/class_servGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:664
+#: plugins/admin/systems/class_phoneGeneric.inc:317
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:357
-#: plugins/admin/systems/class_terminalGeneric.inc:398
+#: plugins/admin/systems/class_workstationGeneric.inc:383
+#: plugins/admin/systems/class_terminalGeneric.inc:424
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:423
-#: plugins/admin/systems/class_workstationGeneric.inc:441
-#: plugins/admin/ogroups/class_termgroup.inc:333
+#: plugins/admin/systems/class_workstationGeneric.inc:450
+#: plugins/admin/systems/class_workstationGeneric.inc:474
+#: plugins/admin/ogroups/class_termgroup.inc:334
 msgid "Saving workstation failed"
 msgstr ""
 
@@ -8428,89 +8378,89 @@ msgstr ""
 msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:101
-#: plugins/admin/systems/class_systemManagement.inc:848
+#: plugins/admin/systems/class_divListSystem.inc:95
+#: plugins/admin/systems/class_systemManagement.inc:876
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_systemManagement.inc:849
+#: plugins/admin/systems/class_divListSystem.inc:97
+#: plugins/admin/systems/class_systemManagement.inc:877
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:104
-#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:106
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:108
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:128
+#: plugins/admin/systems/class_divListSystem.inc:122
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:129
+#: plugins/admin/systems/class_divListSystem.inc:123
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:130
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:131
+#: plugins/admin/systems/class_divListSystem.inc:125
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:132
+#: plugins/admin/systems/class_divListSystem.inc:126
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:133
+#: plugins/admin/systems/class_divListSystem.inc:127
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:134
+#: plugins/admin/systems/class_divListSystem.inc:128
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:129
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:130
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:131
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "Delete system"
 msgstr ""
 
@@ -8606,36 +8556,44 @@ msgstr ""
 msgid "Set status flag for server services/anti virus with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:136
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:172
-#: plugins/admin/systems/class_servDB.inc:177
-#: plugins/admin/systems/class_servDB.inc:183
+#: plugins/admin/systems/class_servDB.inc:143
+#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servDB.inc:169
+#: plugins/admin/systems/class_servDB.inc:179
+#: plugins/admin/systems/class_servDB.inc:184
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servDB.inc:159
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_servDB.inc:163
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:167
+#: plugins/admin/systems/class_servDB.inc:174
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:191
+#: plugins/admin/systems/class_servDB.inc:216
+#: plugins/admin/systems/class_servDB.inc:314
+#, php-format
+msgid ""
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:225
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:245
+#: plugins/admin/systems/class_servDB.inc:279
 msgid "Saving server db settings failed"
 msgstr ""
 
@@ -8664,12 +8622,13 @@ msgid "Option"
 msgstr ""
 
 #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
 #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, php-format
+msgid "Can't read '%s/encodings', please check permissions."
 msgstr ""
 
 #: plugins/admin/systems/class_servNfs.inc:180
@@ -8858,87 +8817,87 @@ msgstr ""
 msgid "Saving server to kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
+#: plugins/admin/systems/terminalService.tpl:146
 msgid "Remote desktop"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
+#: plugins/admin/systems/terminalService.tpl:150
 msgid "Connect method"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:147
+#: plugins/admin/systems/terminalService.tpl:152
 msgid "Choose method to connect to terminal server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:159
 msgid "Terminal server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
+#: plugins/admin/systems/terminalService.tpl:161
 msgid "Select specific terminal server to use"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
+#: plugins/admin/systems/terminalService.tpl:168
 msgid "Font server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
+#: plugins/admin/systems/terminalService.tpl:170
 msgid "Select specific font server to use"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
+#: plugins/admin/systems/terminalService.tpl:186
 msgid "Print device"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
+#: plugins/admin/systems/terminalService.tpl:187
 msgid "Select to start IPP based printing service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:188
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
+#: plugins/admin/systems/terminalService.tpl:194
 msgid "Spool server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:196
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:212
+#: plugins/admin/systems/terminalService.tpl:217
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:54
+#: plugins/admin/systems/class_winGeneric.inc:77
 msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:101
+#: plugins/admin/systems/class_componentGeneric.inc:107
 msgid "Removing generic component failed"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:145
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:144
-#: plugins/admin/systems/class_phoneGeneric.inc:284
+#: plugins/admin/systems/class_componentGeneric.inc:150
+#: plugins/admin/systems/class_phoneGeneric.inc:289
 msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:147
-#: plugins/admin/systems/class_phoneGeneric.inc:287
+#: plugins/admin/systems/class_componentGeneric.inc:153
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The field IP address contains an invalid address."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:161
+#: plugins/admin/systems/class_winGeneric.inc:170
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:223
+#: plugins/admin/systems/class_componentGeneric.inc:230
 msgid "Saving generic component failed"
 msgstr ""
 
@@ -9053,19 +9012,19 @@ msgstr ""
 msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
+#: plugins/admin/systems/class_glpiAccount.inc:575
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
+#: plugins/admin/systems/class_glpiAccount.inc:578
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
+#: plugins/admin/systems/class_glpiAccount.inc:676
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
@@ -9091,48 +9050,48 @@ msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:298
+#: plugins/admin/systems/class_termDNS.inc:291
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:305
+#: plugins/admin/systems/class_termDNS.inc:298
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:304
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:317
+#: plugins/admin/systems/class_termDNS.inc:310
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:338
+#: plugins/admin/systems/class_termDNS.inc:331
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
+#: plugins/admin/systems/class_termDNS.inc:339
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:357
+#: plugins/admin/systems/class_termDNS.inc:350
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:364
-#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#: plugins/admin/systems/class_termDNS.inc:357
+#: plugins/admin/systems/class_servDNSeditZone.inc:421
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:447
+#: plugins/admin/systems/class_termDNS.inc:442
 msgid "Saving terminal to DNS object failed"
 msgstr ""
 
@@ -9180,41 +9139,42 @@ msgstr ""
 msgid "Enable use of Pyzer"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
+#: plugins/admin/systems/class_servRepository.inc:130
 msgid "Remove FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_servRepository.inc:131
 msgid ""
 "This server has FAI repository features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:100
+#: plugins/admin/systems/class_servRepository.inc:133
 msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_servRepository.inc:134
 msgid ""
 "This server has FAI repository features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:145
+#: plugins/admin/systems/class_servRepository.inc:178
 #, php-format
 msgid ""
 "You can't delete this release, it is still used by these workstations [%s]. "
 "Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:179
+#: plugins/admin/systems/class_servRepository.inc:212
 #, php-format
 msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:253
-#: plugins/admin/systems/class_servRepository.inc:274
+#: plugins/admin/systems/class_servRepository.inc:286
+#: plugins/admin/systems/class_servRepository.inc:305
+#: plugins/admin/systems/class_servRepository.inc:309
 #: plugins/admin/systems/servRepositorySetup.tpl:33
 msgid "Sections"
 msgstr ""
@@ -9223,11 +9183,11 @@ msgstr ""
 msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/servRepository.tpl:12
 msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
+#: plugins/admin/systems/servRepository.tpl:31
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
@@ -9308,7 +9268,7 @@ msgid "Serial number (automatically incremented)"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/phonequeue.tpl:67
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
@@ -9326,11 +9286,11 @@ msgstr ""
 msgid "Global zone records"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:126
+#: plugins/admin/systems/class_winGeneric.inc:132
 msgid "Removing Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:224
+#: plugins/admin/systems/class_winGeneric.inc:231
 msgid "Saving Samba workstation failed"
 msgstr ""
 
@@ -9338,16 +9298,47 @@ msgstr ""
 msgid "use"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: include/class_MultiSelectWindow.inc:188
+msgid "Go to root department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:196
+msgid "Go up one department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:204
+msgid "Go to users department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:204
+#: include/class_MultiSelectWindow.inc:206
+msgid "Home"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: include/class_MultiSelectWindow.inc:211
+msgid "Reload list"
+msgstr ""
+
 #: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
 "This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:155
+#: plugins/admin/systems/class_terminalService.inc:156
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:421
+#: plugins/admin/systems/class_terminalService.inc:456
 msgid "Saving terminal service information failed"
 msgstr ""
 
@@ -9515,27 +9506,36 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:400
+#: plugins/admin/systems/class_terminalStartup.inc:411
 msgid "Saving terminal startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:320
+#: plugins/admin/systems/class_servService.inc:108
+#, php-format
+msgid "The share can't be removed since it is still used by %d users:"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:113
+msgid "Please correct the share-/profile settings of these users"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:341
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:379
+#: plugins/admin/systems/class_servService.inc:400
 msgid "Saving server service object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:410
+#: plugins/admin/systems/class_servService.inc:431
 msgid "Creating mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:424
+#: plugins/admin/systems/class_servService.inc:445
 msgid "Removing mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:436
+#: plugins/admin/systems/class_servService.inc:457
 msgid "Saving mount container failed"
 msgstr ""
 
@@ -9604,39 +9604,39 @@ msgstr ""
 msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:167
+#: plugins/admin/systems/class_terminalGeneric.inc:178
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:190
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:202
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:314
+#: plugins/admin/systems/class_terminalGeneric.inc:329
 msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:371
+#: plugins/admin/systems/class_terminalGeneric.inc:389
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:375
+#: plugins/admin/systems/class_terminalGeneric.inc:393
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:475
+#: plugins/admin/systems/class_terminalGeneric.inc:508
 msgid "Saving terminal failed"
 msgstr ""
 
@@ -9813,19 +9813,19 @@ msgstr ""
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:93
 msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:94
 msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/printer.tpl:88
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/printer.tpl:90
 msgid "Admins"
 msgstr ""
 
@@ -9897,23 +9897,23 @@ msgstr ""
 msgid "Database"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:67
+#: plugins/admin/systems/class_servGeneric.inc:77
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:204
 msgid "Removing server failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:224
+#: plugins/admin/systems/class_servGeneric.inc:240
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:231
+#: plugins/admin/systems/class_servGeneric.inc:247
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:317
 msgid "Saving server failed"
 msgstr ""
 
@@ -9941,54 +9941,54 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:82
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
 msgid "New entry"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:177
 #, php-format
 msgid ""
 "Can't rename '%s' to '%s' there is already an entry with the same name in "
 "our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:210
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:219
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:225
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:234
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:242
 #, php-format
 msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:259
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:266
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
@@ -10001,105 +10001,101 @@ msgstr ""
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:272
+#: plugins/admin/systems/class_systemManagement.inc:292
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:299
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:281
-msgid "Disable auto scroll"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:308
+#: plugins/admin/systems/class_systemManagement.inc:330
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:325
+#: plugins/admin/systems/class_systemManagement.inc:347
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:379
+#: plugins/admin/systems/class_systemManagement.inc:401
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:500
 #, php-format
 msgid ""
 "Can't set gotoMode to status 'avtice', the current object couldn't be "
 "identified."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:715
+#: plugins/admin/systems/class_systemManagement.inc:737
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:717
+#: plugins/admin/systems/class_systemManagement.inc:739
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:719
+#: plugins/admin/systems/class_systemManagement.inc:741
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:762
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_systemManagement.inc:774
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:834
+#: plugins/admin/systems/class_systemManagement.inc:862
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:864
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:865
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:866
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:867
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:868
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:871
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:872
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:873
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:846
+#: plugins/admin/systems/class_systemManagement.inc:874
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:847
+#: plugins/admin/systems/class_systemManagement.inc:875
 msgid "Network Device"
 msgstr ""
 
@@ -10134,59 +10130,54 @@ msgid "Website"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:138
-#: plugins/admin/ogroups/class_phonequeue.inc:691
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: plugins/admin/ogroups/class_phonequeue.inc:889
+#: plugins/gofon/conference/generic.tpl:82 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:67
+#: plugins/admin/systems/class_servDNS.inc:75
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:68
+#: plugins/admin/systems/class_servDNS.inc:76
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_servDNS.inc:78
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_servDNS.inc:79
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:159
+#: plugins/admin/systems/class_servDNS.inc:167
 msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:223
+#: plugins/admin/systems/class_servDNS.inc:234
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:261
-msgid "Removing DNS service failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:282
+#: plugins/admin/systems/class_servDNS.inc:302
 msgid "Updating DNS service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:291
+#: plugins/admin/systems/class_servDNS.inc:311
 msgid "Removing DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:312
+#: plugins/admin/systems/class_servDNS.inc:332
 msgid "Saving DNS entries failed"
 msgstr ""
 
@@ -10212,165 +10203,165 @@ msgid ""
 "back."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
 #, php-format
 msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
 #, php-format
 msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:367
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
 msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:371
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
 msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:375
-#: plugins/admin/systems/class_servDNSeditZone.inc:379
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 msgid ""
 "Your mail address contains '@' replace this with '.' to enable GOsa to "
 "create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:383
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:387
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
 msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:391
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:395
+#: plugins/admin/systems/class_servDNSeditZone.inc:407
 msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:399
+#: plugins/admin/systems/class_servDNSeditZone.inc:411
 msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:403
+#: plugins/admin/systems/class_servDNSeditZone.inc:415
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:108
+#: plugins/admin/systems/class_printGeneric.inc:110
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:250
-#: plugins/admin/systems/class_printGeneric.inc:258
-#: plugins/admin/systems/class_printGeneric.inc:263
-#: plugins/admin/systems/class_printGeneric.inc:302
-#: plugins/admin/systems/class_printGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:321
+#: plugins/admin/systems/class_printGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:264
+#: plugins/admin/systems/class_printGeneric.inc:269
+#: plugins/admin/systems/class_printGeneric.inc:315
+#: plugins/admin/systems/class_printGeneric.inc:331
+#: plugins/admin/systems/class_printGeneric.inc:334
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:257
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:259
+#: plugins/admin/systems/class_printGeneric.inc:265
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:264
+#: plugins/admin/systems/class_printGeneric.inc:270
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:308
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:316
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
 "template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:310
-#: plugins/admin/systems/class_printGeneric.inc:313
+#: plugins/admin/systems/class_printGeneric.inc:323
+#: plugins/admin/systems/class_printGeneric.inc:326
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:324
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:314
+#: plugins/admin/systems/class_printGeneric.inc:327
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:319
+#: plugins/admin/systems/class_printGeneric.inc:332
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:335
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:488
+#: plugins/admin/systems/class_printGeneric.inc:501
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:496
+#: plugins/admin/systems/class_printGeneric.inc:509
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:509
+#: plugins/admin/systems/class_printGeneric.inc:522
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:511
+#: plugins/admin/systems/class_printGeneric.inc:524
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:566
+#: plugins/admin/systems/class_printGeneric.inc:582
 msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:624
+#: plugins/admin/systems/class_printGeneric.inc:646
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:780
+#: plugins/admin/systems/class_printGeneric.inc:825
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:826
+#: plugins/admin/systems/class_printGeneric.inc:873
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:848
+#: plugins/admin/systems/class_printGeneric.inc:895
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:856
+#: plugins/admin/systems/class_printGeneric.inc:903
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -10495,7 +10486,8 @@ msgid "Upload wasn't successfull."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -10585,6 +10577,10 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
+
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 msgid "List of attachments"
 msgstr ""
@@ -10632,52 +10628,56 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:108
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/admin/systems/class_phoneGeneric.inc:206
+#: plugins/gofon/macro/class_divListMacros.inc:100
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/admin/systems/class_phoneGeneric.inc:206
+#: plugins/gofon/macro/class_divListMacros.inc:101
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:228
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:228
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:240
+#: plugins/admin/systems/class_phoneGeneric.inc:245
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:247
+#: plugins/admin/systems/class_phoneGeneric.inc:252
 msgid "Removing phone failed"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_phoneGeneric.inc:297
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:295
+#: plugins/admin/systems/class_phoneGeneric.inc:300
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:302
+#: plugins/admin/systems/class_phoneGeneric.inc:307
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:397
+#: plugins/admin/systems/class_phoneGeneric.inc:403
 msgid "Saving phone failed"
 msgstr ""
 
@@ -10761,12 +10761,28 @@ msgstr ""
 msgid "Set status flag for server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
 #, php-format
 msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
 msgid "Printer ppd selection."
 msgstr ""
 
@@ -10785,24 +10801,29 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:61
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
+#: plugins/admin/ogroups/tabs_ogroups.inc:63
+#: plugins/admin/ogroups/tabs_ogroups.inc:168
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/tabs_ogroups.inc:89
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
+#: plugins/admin/ogroups/tabs_ogroups.inc:147
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
+#: plugins/admin/ogroups/phonequeue.tpl:2
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:5
 msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/admin/ogroups/phonequeue.tpl:8
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:4
 #: plugins/gofon/phoneaccount/paste_generic.tpl:2
@@ -10810,108 +10831,114 @@ msgstr ""
 msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
+#: plugins/admin/ogroups/phonequeue.tpl:12
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/phonequeue.tpl:38
+#: plugins/gofon/phoneaccount/generic.tpl:32
+#: plugins/gofon/conference/generic.tpl:46
+msgid "Home server"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:59
 msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:62
+#: plugins/admin/ogroups/phonequeue.tpl:75
 msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/phonequeue.tpl:87
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/phonequeue.tpl:95
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
+#: plugins/admin/ogroups/phonequeue.tpl:99
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
+#: plugins/admin/ogroups/phonequeue.tpl:107
 msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
+#: plugins/admin/ogroups/phonequeue.tpl:112
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
+#: plugins/admin/ogroups/phonequeue.tpl:129
 msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
+#: plugins/admin/ogroups/phonequeue.tpl:137
 msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/phonequeue.tpl:145
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:153
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
+#: plugins/admin/ogroups/phonequeue.tpl:161
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
+#: plugins/admin/ogroups/phonequeue.tpl:169
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
+#: plugins/admin/ogroups/phonequeue.tpl:177
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
+#: plugins/admin/ogroups/phonequeue.tpl:185
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
+#: plugins/admin/ogroups/phonequeue.tpl:193
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
+#: plugins/admin/ogroups/phonequeue.tpl:201
 msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
+#: plugins/admin/ogroups/phonequeue.tpl:217
 msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/phonequeue.tpl:225
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/phonequeue.tpl:231
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:237
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/phonequeue.tpl:247
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/phonequeue.tpl:253
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/phonequeue.tpl:259
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -10923,11 +10950,11 @@ msgstr ""
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:119
+#: plugins/admin/ogroups/class_termgroup.inc:120
 msgid "There must be at least one NTP server selected."
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:173
+#: plugins/admin/ogroups/class_termgroup.inc:174
 #, php-format
 msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
 msgstr ""
@@ -11091,11 +11118,11 @@ msgstr ""
 msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:160
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -11104,67 +11131,67 @@ msgstr ""
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:283
+#: plugins/admin/ogroups/class_ogroup.inc:282
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:285
+#: plugins/admin/ogroups/class_ogroup.inc:284
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
+#: plugins/admin/ogroups/class_ogroup.inc:285
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
+#: plugins/admin/ogroups/class_ogroup.inc:286
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
+#: plugins/admin/ogroups/class_ogroup.inc:287
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:289
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:291
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:291
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:293
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:486
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:606
+#: plugins/admin/ogroups/class_ogroup.inc:604
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:623
+#: plugins/admin/ogroups/class_ogroup.inc:621
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:672
+#: plugins/admin/ogroups/class_ogroup.inc:670
 msgid "Saving object group failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:685
+#: plugins/admin/ogroups/class_ogroup.inc:683
 msgid "Removing object group failed"
 msgstr ""
 
@@ -11174,147 +11201,208 @@ msgid ""
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:41
+#: plugins/admin/ogroups/class_mailogroup.inc:48
 msgid ""
 "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:43
+#: plugins/admin/ogroups/class_mailogroup.inc:50
 msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:98
+#: plugins/admin/ogroups/class_mailogroup.inc:105
 msgid "Saving mail objectgroup settings failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:131
+#: plugins/admin/ogroups/class_mailogroup.inc:138
 msgid "Removing mail objectgroup settings failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
+#: plugins/admin/ogroups/class_phonequeue.inc:92
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:98
+#, php-format
+msgid ""
+"The specified home server '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry while ignoring old "
+"accounts."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:122
 msgid "ring all"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/admin/ogroups/class_phonequeue.inc:123
 msgid "round robin"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
+#: plugins/admin/ogroups/class_phonequeue.inc:124
 msgid "least recently called"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
+#: plugins/admin/ogroups/class_phonequeue.inc:125
 msgid "fewest completed calls"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/admin/ogroups/class_phonequeue.inc:126
 msgid "random"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
+#: plugins/admin/ogroups/class_phonequeue.inc:127
 msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:148
+#: plugins/gofon/macro/class_gofonMacro.inc:179
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:265
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:189
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:276
+#, php-format
+msgid ""
+"The MySQL home server '%s' isn't reachable as user '%s', check GOsa log for "
+"mysql error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:166
+#: plugins/gofon/macro/class_gofonMacro.inc:196
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:283
+#, php-format
+msgid "Can't select database '%s' on home server '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:295
+#, php-format
+msgid ""
+"The MySQL initial home server '%s' isn't reachable as user '%s', check GOsa "
+"log for mysql error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:302
+#, php-format
+msgid "Can't select database '%s' on initial home server '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
+#: plugins/admin/ogroups/class_phonequeue.inc:212
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:116
+#: plugins/admin/ogroups/class_phonequeue.inc:214
 msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:117
+#: plugins/admin/ogroups/class_phonequeue.inc:215
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
+#: plugins/admin/ogroups/class_phonequeue.inc:298
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone queue."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:301
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
+msgid "Please select a valid goFonHomeServer."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:307
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
+#: plugins/admin/ogroups/class_phonequeue.inc:310
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
+#: plugins/admin/ogroups/class_phonequeue.inc:313
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
+#: plugins/admin/ogroups/class_phonequeue.inc:316
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:319
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:227
+#: plugins/admin/ogroups/class_phonequeue.inc:342
+#: plugins/admin/ogroups/class_phonequeue.inc:391
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:301
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:862
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer). Your settings "
+"can't be saved to asterisk database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:240
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:270
-#, php-format
-msgid ""
-"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/ogroups/class_phonequeue.inc:374
+msgid "Error while removing old queue entries from database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:625
-#: plugins/gofon/macro/class_gofonMacro.inc:246
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:91
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:311
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1053
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:281
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
-#, php-format
-msgid "Can't select database %s on %s."
+#: plugins/admin/ogroups/class_phonequeue.inc:375
+#: plugins/admin/ogroups/class_phonequeue.inc:434
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:407
+msgid "Please have a look a the gosa logfiles."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:281
-#: plugins/admin/ogroups/class_phonequeue.inc:495
-#: plugins/admin/ogroups/class_phonequeue.inc:661
+#: plugins/admin/ogroups/class_phonequeue.inc:434
+msgid "Could not detect old queue entry, query failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:520
 #, php-format
-msgid "Can't delete in Database %s, on Server %s."
+msgid ""
+"More than one entry in queue table found, that uses the name ('%s'). Please "
+"fix this issue manually first."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "Mysql query failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/admin/ogroups/class_phonequeue.inc:527
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1158
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1160
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
+#: plugins/admin/ogroups/class_phonequeue.inc:761
+#: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1380
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1382
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:565
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:587
+#: plugins/admin/ogroups/class_phonequeue.inc:830
 msgid "Saving phone queue failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:615
-#: plugins/gofon/macro/class_gofonMacro.inc:235
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:300
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1042
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/ogroups/class_phonequeue.inc:882
+msgid "Removing phone queue failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:684
-msgid "Removing phone queue failed"
+#: plugins/admin/ogroups/paste_generic.tpl:7
+msgid "Please enter the new object group name"
+msgstr ""
+
+#: plugins/admin/ogroups/paste_mail.tpl:7
+msgid "Please enter a mail address"
 msgstr ""
 
 #: plugins/gofon/fonreports/main.inc:21
@@ -11409,27 +11497,27 @@ msgstr ""
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/gofon/macro/class_divListMacros.inc:74
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:103
+#: plugins/gofon/macro/class_divListMacros.inc:94
 msgid "Edit macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "Delete macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:99
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:100
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:101
 msgid "invisible"
 msgstr ""
 
@@ -11451,89 +11539,91 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:255
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:650
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:249
-msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). Your settings "
-"can't be saved to asterisk database."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:187
-msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:194
-msgid "Removing phone macro failed"
+#: plugins/gofon/macro/class_gofonMacro.inc:226
+#, php-format
+msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:208
-msgid "Removing phone macro reverences failed"
+#: plugins/gofon/macro/class_gofonMacro.inc:294
+#, php-format
+msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:221
-msgid ""
-"There is no mysql extension available in your php setup, can't save any "
-"changes to asterisk db."
+#: plugins/gofon/macro/class_gofonMacro.inc:297
+#, php-format
+msgid "More than one ')' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
+#: plugins/gofon/macro/class_gofonMacro.inc:301
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:309
+#: plugins/gofon/macro/class_gofonMacro.inc:305
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:318
-#: plugins/gofon/macro/class_gofonMacro.inc:326
+#: plugins/gofon/macro/class_gofonMacro.inc:334
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:340
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: plugins/gofon/macro/class_gofonMacro.inc:369
+msgid ""
+"There must be at least one server with an asterisk database to save this "
+"phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:388
+#: plugins/gofon/macro/class_gofonMacro.inc:383
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:393
+#: plugins/gofon/macro/class_gofonMacro.inc:389
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:393
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:402
+#: plugins/gofon/macro/class_gofonMacro.inc:399
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:410
+msgid ""
+"This macro is still in use. It is necessary to mark this macro as visible "
+"for users."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:418
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:413
-msgid "Please choose a valid  base."
+#: plugins/gofon/macro/class_gofonMacro.inc:436
+msgid ""
+"This macro is still in use. To delete this Macro ensure that nobody has "
+"selected it."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:449
+msgid ""
+"Could not remove the macro entry from asterisk databases. Please check your "
+"asterisk database configurations."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:455
+msgid "Removing phone macro failed"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:464
+msgid "Removing phone macro reverences failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:498
 msgid "Saving phone macro failed"
 msgstr ""
 
@@ -11545,6 +11635,10 @@ msgstr ""
 msgid "type"
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
+msgid "This 'dn' is no phone macro."
+msgstr ""
+
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
 msgstr ""
@@ -11567,7 +11661,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:336
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:920
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1150
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -11592,133 +11686,195 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/generic.tpl:35
+msgid "Select the accounts home server"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:42
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/generic.tpl:50
 #: plugins/gofon/phoneaccount/paste_generic.tpl:40
 msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:68
+#: plugins/gofon/phoneaccount/generic.tpl:69
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:123
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:105
+#, php-format
+msgid ""
+"The specified goFonHomeServer '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry ignoring old "
+"accounts."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1264
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:120
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1275
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:157
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:175
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:309
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:429
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s'. Abort saving entries to "
+"keep the database consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:437
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:464
+#, php-format
+msgid ""
+"Can't select database %s on %s. Abort saving entries to keep the database "
+"consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:456
+#, php-format
+msgid ""
+"The old MySQL home server '%s' isn't reachable as user '%s'. Abort saving "
+"entries to keep the database consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:745
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:958
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:853
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:969
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:762
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:975
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:760
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:973
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:976
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:776
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:989
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:806
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:892
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1114
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone account."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1122
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1130
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:903
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:913
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1143
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1084
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1306
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1089
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1311
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1122
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1344
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1129
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1351
 msgid "Removing phone account failed"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1428
+#, php-format
+msgid ""
+"The previously selected asterisk home server (%s) is no longer available. "
+"Remove aborted."
+msgstr ""
+
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 #: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
@@ -11755,40 +11911,40 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:74
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/generic.tpl:112
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:120
 #: plugins/gofon/conference/class_divListConferences.inc:48
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:134
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/generic.tpl:151
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:157
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:163
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:169
 msgid "Count users"
 msgstr ""
 
@@ -11800,15 +11956,15 @@ msgstr ""
 msgid "Regular expression for matching conference names"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:75
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:75
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:140
+#: plugins/gofon/conference/class_divListConferences.inc:138
 msgid "Conference"
 msgstr ""
 
@@ -11820,36 +11976,66 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:230
+#, php-format
+msgid ""
+"Could not remove the conference entry from database on home server (%s). "
+"Please check your asterisk database configuration."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:319
+#, php-format
+msgid ""
+"The previously selected asterisk home server (%s) is no longer available."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:324
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:219
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:328
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:332
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:336
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:231
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:340
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:261
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
 msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
+"Can not check if there are already some entries with given telephone number "
+"and/or cn in the destination home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:406
+msgid ""
+"Can not remove entries with some telephone number and/or cn from destination "
+"home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:524
+msgid ""
+"Can not check if entry exists in old database. Please have a look a the gosa "
+"logfiles."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+msgid ""
+"Can not remove old entries from initial home server. Please have a look a "
+"the gosa logfiles."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:509
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:633
 msgid "Saving phone conference failed"
 msgstr ""
 
@@ -11958,49 +12144,49 @@ msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:550
+#: include/class_plugin.inc:555
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:584 include/class_password-methods.inc:181
+#: include/class_plugin.inc:589 include/class_password-methods.inc:183
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:618
+#: include/class_plugin.inc:623
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:926
+#: include/class_plugin.inc:931
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:933
+#: include/class_plugin.inc:938
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:947 include/class_plugin.inc:976
+#: include/class_plugin.inc:952 include/class_plugin.inc:981
 msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/class_plugin.inc:963
+#: include/class_plugin.inc:968
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_password-methods.inc:165
+#: include/class_password-methods.inc:167
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:202
+#: include/class_password-methods.inc:204
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
@@ -12411,7 +12597,7 @@ msgid ""
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12439,30 +12625,27 @@ msgstr ""
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:248
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
 msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
 msgstr ""
 
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
+#: include/class_password-methods-kerberos.inc:44
 msgid ""
 "Warning: Can't set kerberos password. Your PHP version has no kerberos "
 "support, password has not been changed."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:52
+#: include/class_password-methods-kerberos.inc:53
 msgid "Kerberos database communication failed!"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
+#: include/class_password-methods-kerberos.inc:60
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
@@ -12540,7 +12723,7 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:394
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -12574,7 +12757,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:380
+#: include/php_setup.inc:71 html/main.php:388
 msgid "Toggle information"
 msgstr ""
 
@@ -12598,15 +12781,15 @@ msgstr ""
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
 msgid "Arguments"
 msgstr ""
 
@@ -12681,7 +12864,7 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1115 include/functions.inc:1306
+#: include/functions.inc:1115 include/functions.inc:1309
 msgid "LDAP error:"
 msgstr ""
 
@@ -12716,35 +12899,41 @@ msgid ""
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1488
+#: include/functions.inc:1491
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1516
+#: include/functions.inc:1519
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1790
+#: include/functions.inc:1793
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1833
+#: include/functions.inc:1836
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions_dns.inc:166
+#: include/functions_dns.inc:169
 #, php-format
 msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
 msgstr ""
 
-#: include/functions_dns.inc:171
+#: include/functions_dns.inc:174
 #, php-format
 msgid ""
 "Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
 "zone."
 msgstr ""
 
+#: include/functions_dns.inc:610
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
 #: include/class_tabs.inc:190
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
@@ -12754,18 +12943,18 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:115
+#: include/class_pluglist.inc:116
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
-#: include/class_pluglist.inc:229
+#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
+#: include/class_pluglist.inc:230
 msgid "Unknown"
 msgstr ""
 
-#: include/class_pluglist.inc:137 ihtml/themes/altlinux/framework.tpl:14
+#: include/class_pluglist.inc:138 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -12795,7 +12984,7 @@ msgstr ""
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:469
+#: include/class_config.inc:505
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -12826,41 +13015,48 @@ msgstr ""
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:562 include/class_ldap.inc:576
+#: include/class_ldap.inc:562 include/class_ldap.inc:579
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:673
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:734
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:792
+#: include/class_ldap.inc:803
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:794
+#: include/class_ldap.inc:805
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:990
+#: include/class_ldap.inc:1001
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1003
+#: include/class_ldap.inc:1014
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:1030
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -12998,11 +13194,11 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/index.php:49 html/index.php:335
+#: html/index.php:49 html/index.php:333
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:335
+#: html/index.php:49 html/index.php:333
 msgid "Enter SSL session"
 msgstr ""
 
@@ -13022,28 +13218,35 @@ msgid ""
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:228
+#: html/index.php:227
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:256
+#: html/index.php:246 ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+
+#: html/index.php:254
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:258
+#: html/index.php:256
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:265
+#: html/index.php:263
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:289
+#: html/index.php:287
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:341
+#: html/index.php:339
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -13077,20 +13280,20 @@ msgid ""
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:206
+#: html/main.php:220
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:341
+#: html/main.php:349
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:364
 msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:380
+#: html/main.php:388
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -13139,7 +13342,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:14
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your username and password to log in"
 msgstr ""
 
@@ -13454,14 +13657,18 @@ msgstr ""
 msgid "Copy &amp; paste wizard"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:2
+msgid "Object to be pasted"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:6
 msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. GOsa shows the relevant attributes. Please "
 "maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:22
 msgid "Operation complete"
 msgstr ""