Do not create admin groups with spaces. Closes #589

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index d1761aabcbb0153aacc3f4316b0b6cfb775ca4c2..9fede4482a3ee0f636dcd051e9deeda85db7799f 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: 2007-10-09 08:07+0200\n"
+"POT-Creation-Date: 2008-02-21 11:15+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"
@@ -30,12 +30,12 @@ msgstr ""
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:144 contrib/gosa.conf:148
 #: contrib/gosa.conf:157 contrib/gosa.conf:163 contrib/gosa.conf:168
-#: contrib/gosa.conf:174 contrib/gosa.conf:183 contrib/gosa.conf:212
-#: contrib/gosa.conf:227 contrib/gosa.conf:233 contrib/gosa.conf:256
-#: contrib/gosa.conf:262 contrib/gosa.conf:268 contrib/gosa.conf:272
-#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
-#: plugins/personal/scalix/generic.tpl:4
+#: contrib/gosa.conf:175 contrib/gosa.conf:180 contrib/gosa.conf:190
+#: contrib/gosa.conf:220 contrib/gosa.conf:236 contrib/gosa.conf:242
+#: contrib/gosa.conf:265 contrib/gosa.conf:271 contrib/gosa.conf:277
+#: contrib/gosa.conf:281 plugins/personal/mail/generic.tpl:4
+#: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/scalix/generic.tpl:4
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
@@ -74,7 +74,7 @@ msgstr ""
 #: plugins/personal/environment/class_environment.inc:7
 #: plugins/admin/groups/class_divListGroup.inc:131
 #: plugins/admin/users/class_divListUsers.inc:144
-#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: plugins/admin/ogroups/tabs_ogroups.inc:135
 msgid "Environment"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:123
 #: plugins/admin/users/class_divListUsers.inc:146
 #: plugins/admin/ogroups/tabs_ogroups.inc:79
-#: plugins/admin/ogroups/tabs_ogroups.inc:209
+#: plugins/admin/ogroups/tabs_ogroups.inc:211
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/generic/references/class_reference.inc:24
@@ -131,7 +131,7 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:129
 #: plugins/admin/users/class_divListUsers.inc:148
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:869
+#: plugins/admin/systems/class_systemManagement.inc:883
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -159,9 +159,9 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:153 contrib/gosa.conf:159 contrib/gosa.conf:164
-#: contrib/gosa.conf:170 contrib/gosa.conf:179 contrib/gosa.conf:208
-#: contrib/gosa.conf:223 contrib/gosa.conf:229 contrib/gosa.conf:235
-#: contrib/gosa.conf:258 contrib/gosa.conf:264
+#: contrib/gosa.conf:170 contrib/gosa.conf:186 contrib/gosa.conf:216
+#: contrib/gosa.conf:232 contrib/gosa.conf:238 contrib/gosa.conf:244
+#: contrib/gosa.conf:267 contrib/gosa.conf:273
 msgid "References"
 msgstr ""
 
@@ -169,25 +169,25 @@ msgstr ""
 #: plugins/admin/systems/class_servRepository.inc:283
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:35
-#: plugins/gofon/conference/generic.tpl:100
+#: plugins/gofon/conference/generic.tpl:109
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:865
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:914
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:175 contrib/gosa.conf:184 contrib/gosa.conf:213
-#: plugins/admin/ogroups/tabs_ogroups.inc:107
+#: contrib/gosa.conf:181 contrib/gosa.conf:191 contrib/gosa.conf:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:108
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:176 contrib/gosa.conf:214
+#: contrib/gosa.conf:182 contrib/gosa.conf:222
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:206 contrib/gosa.conf:216
+#: contrib/gosa.conf:183 contrib/gosa.conf:213 contrib/gosa.conf:224
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -205,55 +205,55 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:178 contrib/gosa.conf:207 contrib/gosa.conf:222
-#: contrib/gosa.conf:228 contrib/gosa.conf:234 contrib/gosa.conf:257
-#: contrib/gosa.conf:263
+#: contrib/gosa.conf:185 contrib/gosa.conf:215 contrib/gosa.conf:231
+#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:266
+#: contrib/gosa.conf:272
 msgid "Inventory"
 msgstr ""
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:192
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/systems/servkolab.tpl:33
+#: contrib/gosa.conf:193 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:195
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr ""
 
-#: contrib/gosa.conf:190 plugins/admin/fai/faiPackage.tpl:29
+#: contrib/gosa.conf:197 plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:192 contrib/gosa.conf:194 contrib/gosa.conf:218
-#: contrib/gosa.conf:220
+#: contrib/gosa.conf:199 contrib/gosa.conf:201 contrib/gosa.conf:227
+#: contrib/gosa.conf:229
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:197 contrib/gosa.conf:199
+#: contrib/gosa.conf:204 contrib/gosa.conf:206
 msgid "DNS"
 msgstr ""
 
-#: contrib/gosa.conf:202 contrib/gosa.conf:204
+#: contrib/gosa.conf:209 contrib/gosa.conf:211
 msgid "DHCP"
 msgstr ""
 
-#: contrib/gosa.conf:215 plugins/personal/environment/environment.tpl:204
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: contrib/gosa.conf:223 plugins/personal/environment/environment.tpl:184
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:285
+#: contrib/gosa.conf:294
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:297 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:306 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -263,11 +263,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:298
+#: contrib/gosa.conf:307
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:299 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:308 plugins/personal/mail/generic.tpl:206
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/gotomasses/goto_task.tpl:129
 #: plugins/addons/ldapmanager/contentimport.tpl:49
@@ -279,15 +279,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:300
+#: contrib/gosa.conf:309
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:314 contrib/gosa.conf:344
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:309 contrib/gosa.conf:339
+#: contrib/gosa.conf:318 contrib/gosa.conf:348
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -295,33 +295,36 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:313 contrib/gosa.conf:343
+#: contrib/gosa.conf:322 contrib/gosa.conf:352
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
+#: plugins/admin/fai/class_divListFai.inc:179
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:317 contrib/gosa.conf:347
+#: contrib/gosa.conf:326 contrib/gosa.conf:356
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_divListFai.inc:178
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:321 contrib/gosa.conf:351
+#: contrib/gosa.conf:330 contrib/gosa.conf:360
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
+#: plugins/admin/fai/class_divListFai.inc:181
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:325 contrib/gosa.conf:355
+#: contrib/gosa.conf:334 contrib/gosa.conf:364
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:326 contrib/gosa.conf:356
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
+#: contrib/gosa.conf:335 contrib/gosa.conf:365
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:330 contrib/gosa.conf:360
+#: contrib/gosa.conf:339 contrib/gosa.conf:369
 msgid "Packages"
 msgstr ""
 
@@ -361,7 +364,7 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:29
 #: plugins/admin/applications/class_applicationManagement.inc:26
 #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/systems/class_systemManagement.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/gofon/fonreports/class_fonreport.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
@@ -441,12 +444,12 @@ msgstr ""
 #: plugins/admin/systems/class_dhcpHost.inc:82
 #: plugins/admin/systems/goSpamServer.tpl:101
 #: plugins/admin/systems/goVirusServer.tpl:144
-#: plugins/admin/systems/servdnseditzone.tpl:128
+#: plugins/admin/systems/servdnseditzone.tpl:135
 #: 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:597
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/class_systemManagement.inc:604
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/class_dhcpSharedNetwork.inc:88
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
@@ -525,7 +528,7 @@ msgstr ""
 #: plugins/admin/systems/class_dhcpHost.inc:83
 #: plugins/admin/systems/goSpamServer.tpl:103
 #: plugins/admin/systems/goVirusServer.tpl:146
-#: plugins/admin/systems/servdnseditzone.tpl:129
+#: plugins/admin/systems/servdnseditzone.tpl:136
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
 #: plugins/admin/systems/servRepositorySetup.tpl:43
@@ -536,8 +539,8 @@ msgstr ""
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/dhcpNewSection.tpl:17
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:599
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/class_systemManagement.inc:606
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:18
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
@@ -582,7 +585,7 @@ 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/scalix/main.inc:117
-#: plugins/personal/environment/environment.tpl:171
+#: plugins/personal/environment/environment.tpl:151
 #: plugins/personal/environment/main.inc:116
 #: plugins/personal/generic/main.inc:175
 #: plugins/personal/connectivity/main.inc:130
@@ -598,7 +601,7 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/servdnseditzone.tpl:40
+#: plugins/admin/systems/servdnseditzone.tpl:47
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #: plugins/admin/systems/printer.tpl:52
@@ -620,7 +623,7 @@ msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:60 setup/setup_feedback.tpl:32
+#: plugins/admin/systems/servdnseditzone.tpl:67 setup/setup_feedback.tpl:32
 #: html/getxls.php:174
 msgid "Mail address"
 msgstr ""
@@ -701,7 +704,7 @@ msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:13
-#: plugins/personal/mail/generic.tpl:199
+#: plugins/personal/mail/generic.tpl:213
 msgid "Forward messages to"
 msgstr ""
 
@@ -712,7 +715,7 @@ msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61 plugins/personal/mail/generic.tpl:57
-#: plugins/personal/mail/generic.tpl:208
+#: plugins/personal/mail/generic.tpl:222
 #: plugins/personal/mail/mail_locals.tpl:75
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
@@ -724,9 +727,9 @@ msgstr ""
 #: plugins/personal/scalix/generic.tpl:82
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:65
-#: plugins/personal/environment/environment.tpl:152
-#: plugins/personal/environment/environment.tpl:169
-#: plugins/personal/environment/environment.tpl:213
+#: plugins/personal/environment/environment.tpl:132
+#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:193
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:33
 #: plugins/personal/connectivity/class_kolabAccount.inc:237
@@ -741,7 +744,7 @@ msgstr ""
 #: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:42
 #: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
 #: plugins/admin/groups/mail.tpl:69 plugins/admin/groups/mail.tpl:113
-#: plugins/admin/groups/class_groupMail.inc:578
+#: plugins/admin/groups/class_groupMail.inc:589
 #: plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
@@ -752,25 +755,25 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/workstationStartup.tpl:104
-#: plugins/admin/systems/workstationStartup.tpl:127
-#: plugins/admin/systems/workstationStartup.tpl:146
+#: plugins/admin/systems/workstationStartup.tpl:122
+#: plugins/admin/systems/workstationStartup.tpl:145
+#: plugins/admin/systems/workstationStartup.tpl:164
 #: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
 #: plugins/admin/systems/workstation.tpl:90
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:668
-#: plugins/admin/systems/class_termDNS.inc:688
+#: plugins/admin/systems/class_termDNS.inc:723
+#: plugins/admin/systems/class_termDNS.inc:743
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
-#: plugins/admin/systems/servdnseditzone.tpl:115
+#: plugins/admin/systems/servdnseditzone.tpl:122
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: 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:446
-#: plugins/admin/systems/class_servDNSeditZone.inc:565
+#: plugins/admin/systems/class_servDNSeditZone.inc:587
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
@@ -790,7 +793,7 @@ msgid "Add"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/mail/generic.tpl:210
+#: plugins/personal/mail/generic.tpl:224
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:114
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
@@ -798,16 +801,16 @@ msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62 plugins/personal/mail/generic.tpl:59
-#: plugins/personal/mail/generic.tpl:212
+#: plugins/personal/mail/generic.tpl:226
 #: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:336
 #: plugins/personal/scalix/generic.tpl:84
-#: plugins/personal/environment/class_environment.inc:672
-#: plugins/personal/environment/environment.tpl:170
-#: plugins/personal/environment/environment.tpl:198
-#: plugins/personal/environment/environment.tpl:214
+#: plugins/personal/environment/class_environment.inc:680
+#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:178
+#: plugins/personal/environment/environment.tpl:194
 #: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -828,22 +831,22 @@ msgstr ""
 #: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
-#: plugins/admin/systems/workstationStartup.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:128
+#: plugins/admin/systems/workstationStartup.tpl:123
+#: plugins/admin/systems/workstationStartup.tpl:146
 #: plugins/admin/systems/terminal.tpl:111
 #: plugins/admin/systems/workstation.tpl:92
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:164
-#: plugins/admin/systems/class_termDNS.inc:682
+#: plugins/admin/systems/class_termDNS.inc:737
 #: 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:188
 #: plugins/admin/systems/remove_glpi.tpl:14
 #: plugins/admin/systems/printer.tpl:78 plugins/admin/systems/printer.tpl:96
-#: plugins/admin/systems/class_servDNSeditZone.inc:326
-#: plugins/admin/systems/class_servDNSeditZone.inc:559
+#: plugins/admin/systems/class_servDNSeditZone.inc:347
+#: plugins/admin/systems/class_servDNSeditZone.inc:581
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
@@ -871,7 +874,7 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/gotomasses/class_target_list.inc:171
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:870
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
@@ -887,7 +890,7 @@ msgid "Quota usage"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:164
+#: plugins/admin/systems/class_terminalInfo.inc:169
 msgid "not defined"
 msgstr ""
 
@@ -919,44 +922,44 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:115
+#: plugins/personal/mail/generic.tpl:118
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:115
+#: plugins/personal/mail/generic.tpl:129
 msgid "Activate vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:121
+#: plugins/personal/mail/generic.tpl:135
 msgid "from"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:138
+#: plugins/personal/mail/generic.tpl:152
 msgid "till"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:162
+#: plugins/personal/mail/generic.tpl:176
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:162
+#: plugins/personal/mail/generic.tpl:176
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/generic.tpl:178
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:181
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:174
+#: plugins/personal/mail/generic.tpl:188
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:176
+#: plugins/personal/mail/generic.tpl:190
 #: plugins/personal/scalix/generic.tpl:51
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
@@ -965,7 +968,8 @@ msgstr ""
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:182
+#: plugins/personal/mail/generic.tpl:196
+#: plugins/admin/groups/acl_definition.inc:258
 #: include/sieve/templates/object_container.tpl:31
 #: include/sieve/templates/element_vacation.tpl:44
 #: include/sieve/class_sieveManagement.inc:515
@@ -973,20 +977,20 @@ msgstr ""
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:220
+#: plugins/personal/mail/generic.tpl:234
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:225
+#: plugins/personal/mail/generic.tpl:239
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:226
+#: plugins/personal/mail/generic.tpl:240
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:88
-#: plugins/admin/groups/class_groupMail.inc:80
+#: plugins/admin/groups/class_groupMail.inc:81
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
@@ -1001,7 +1005,7 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
-#: plugins/admin/groups/class_groupMail.inc:343
+#: plugins/admin/groups/class_groupMail.inc:344
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Remove mail account"
 msgstr ""
@@ -1013,20 +1017,20 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:300
-#: plugins/admin/groups/class_groupMail.inc:344
+#: plugins/admin/groups/class_groupMail.inc:345
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:303
-#: plugins/admin/groups/class_groupMail.inc:346
+#: plugins/admin/groups/class_groupMail.inc:347
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 msgid "Create mail account"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:303
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:348
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -1038,7 +1042,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:359
-#: plugins/admin/groups/class_groupMail.inc:421
+#: plugins/admin/groups/class_groupMail.inc:423
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
@@ -1046,7 +1050,7 @@ msgstr ""
 #: plugins/personal/mail/class_mailAccount.inc:402
 #: plugins/personal/scalix/class_scalixAccount.inc:158
 #: plugins/personal/scalix/class_scalixAccount.inc:163
-#: plugins/admin/groups/class_groupMail.inc:449
+#: plugins/admin/groups/class_groupMail.inc:451
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -1054,11 +1058,11 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:412
 #: plugins/personal/scalix/class_scalixAccount.inc:173
-#: plugins/admin/groups/class_groupMail.inc:454
+#: plugins/admin/groups/class_groupMail.inc:456
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
@@ -1068,7 +1072,7 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
@@ -1078,7 +1082,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
@@ -1088,7 +1092,7 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/mail/class_mailAccount.inc:577
 #: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
@@ -1098,7 +1102,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
@@ -1108,7 +1112,7 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
@@ -1118,7 +1122,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
@@ -1128,7 +1132,7 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
@@ -1138,7 +1142,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/mail/class_mailAccount.inc:578
 #: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
@@ -1148,7 +1152,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
@@ -1158,7 +1162,7 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
@@ -1168,7 +1172,7 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/mail/class_mailAccount.inc:579
 #: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
@@ -1178,65 +1182,65 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:750
+#: plugins/personal/mail/class_mailAccount.inc:770
 msgid "Removing mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:886
+#: plugins/personal/mail/class_mailAccount.inc:917
 msgid "Saving mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:940
+#: plugins/personal/mail/class_mailAccount.inc:973
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:945
-#: plugins/admin/groups/class_groupMail.inc:903
+#: plugins/personal/mail/class_mailAccount.inc:978
+#: plugins/admin/groups/class_groupMail.inc:925
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:949
-#: plugins/personal/mail/class_mailAccount.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:598
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/addons/addressbook/class_addressbook.inc:609
 #: 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:959
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/admin/groups/class_groupMail.inc:934
 #: 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:965
-#: plugins/admin/groups/class_groupMail.inc:918
+#: plugins/personal/mail/class_mailAccount.inc:998
+#: plugins/admin/groups/class_groupMail.inc:940
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:974
-#: plugins/admin/groups/class_groupMail.inc:927
+#: plugins/personal/mail/class_mailAccount.inc:1007
+#: plugins/admin/groups/class_groupMail.inc:949
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
-#: plugins/admin/groups/class_groupMail.inc:935
+#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/admin/groups/class_groupMail.inc:957
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:988
+#: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1025
 msgid "Time interval to show vacation message is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1146
+#: plugins/personal/mail/class_mailAccount.inc:1179
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1148
+#: plugins/personal/mail/class_mailAccount.inc:1181
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1427,9 +1431,10 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:51
+#: plugins/admin/groups/class_groupApplication.inc:719
 #: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/systems/class_systemManagement.inc:243
-#: include/functions.inc:1568 setup/class_setup.inc:261
+#: plugins/admin/systems/class_systemManagement.inc:246
+#: include/functions.inc:1611 setup/class_setup.inc:261
 #: setup/class_setup.inc:263
 msgid "Back"
 msgstr ""
@@ -1597,6 +1602,7 @@ msgid "active"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:865
 #: plugins/personal/posix/class_posixAccount.inc:1005
 msgid "Group of user"
 msgstr ""
@@ -1606,9 +1612,9 @@ msgid "unconfigured"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:200
-#: plugins/admin/systems/class_workstationService.inc:177
-#: plugins/admin/systems/class_workstationStartup.inc:860
-#: plugins/admin/systems/class_terminalService.inc:190
+#: plugins/admin/systems/class_workstationService.inc:173
+#: plugins/admin/systems/class_workstationStartup.inc:876
+#: plugins/admin/systems/class_terminalService.inc:187
 #: plugins/admin/systems/class_dhcpAdvanced.inc:78
 #: plugins/admin/systems/class_dhcpAdvanced.inc:87
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:248
@@ -2206,7 +2212,7 @@ msgid "Notify User"
 msgstr ""
 
 #: plugins/personal/scalix/generic.tpl:74
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:454
 msgid "Scalix email addresses"
 msgstr ""
 
@@ -2322,8 +2328,8 @@ msgid "auto"
 msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:216
-#: plugins/admin/systems/class_workstationService.inc:83
-#: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:78
+#: plugins/admin/systems/class_terminalService.inc:90
 #, php-format
 msgid ""
 "You have specified an external resolution hook which can't be read, please "
@@ -2332,7 +2338,7 @@ msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:228
 #: plugins/personal/environment/class_environment.inc:475
-#: plugins/personal/environment/class_environment.inc:824
+#: plugins/personal/environment/class_environment.inc:832
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:402
 msgid "None"
 msgstr ""
@@ -2368,7 +2374,7 @@ msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:575
 #: plugins/personal/environment/class_environment.inc:588
-#: plugins/admin/systems/class_workstationStartup.inc:658
+#: plugins/admin/systems/class_workstationStartup.inc:673
 #: plugins/admin/systems/class_terminalStartup.inc:204
 msgid "You must specify a valid mount point."
 msgstr ""
@@ -2377,56 +2383,56 @@ msgstr ""
 msgid "Spaces are not allowed in the mount path!"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:658
-#: plugins/personal/environment/class_environment.inc:659
+#: plugins/personal/environment/class_environment.inc:666
 #: plugins/personal/environment/class_environment.inc:667
-#: plugins/personal/environment/class_environment.inc:668
+#: plugins/personal/environment/class_environment.inc:675
+#: plugins/personal/environment/class_environment.inc:676
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:673
+#: plugins/personal/environment/class_environment.inc:681
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:827
+#: plugins/personal/environment/class_environment.inc:835
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:873
+#: plugins/personal/environment/class_environment.inc:881
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:925
+#: plugins/personal/environment/class_environment.inc:933
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:932
+#: plugins/personal/environment/class_environment.inc:940
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:970
+#: plugins/personal/environment/class_environment.inc:978
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1123
+#: plugins/personal/environment/class_environment.inc:1131
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1136
+#: plugins/personal/environment/class_environment.inc:1144
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1168
-#: plugins/admin/groups/acl_definition.inc:445
+#: plugins/personal/environment/class_environment.inc:1176
+#: plugins/admin/groups/acl_definition.inc:447
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1173
+#: plugins/personal/environment/class_environment.inc:1181
 msgid "Default printer"
 msgstr ""
 
@@ -2470,8 +2476,8 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:136
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:116
+#: plugins/personal/environment/environment.tpl:161
 msgid "Environment managment settings"
 msgstr ""
 
@@ -2499,53 +2505,50 @@ msgstr ""
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/environment.tpl:101
+#: plugins/personal/environment/environment.tpl:64
 msgid "Kiosk profile settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:69
-#: plugins/personal/environment/environment.tpl:104
+#: plugins/personal/environment/environment.tpl:68
+#: plugins/personal/environment/environment.tpl:80
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:75
-#: plugins/personal/environment/environment.tpl:108
+#: plugins/personal/environment/environment.tpl:74
+#: plugins/personal/environment/environment.tpl:84
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/environment.tpl:115
+#: plugins/personal/environment/environment.tpl:95
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:90
-#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/environment/environment.tpl:100
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:139
-#: plugins/admin/systems/workstationStartup.tpl:132
+#: plugins/personal/environment/environment.tpl:119
+#: plugins/admin/systems/workstationStartup.tpl:150
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:144
+#: plugins/personal/environment/environment.tpl:124
 msgid "User used to connect to the share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:145
+#: plugins/personal/environment/environment.tpl:125
 msgid "Select a share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:151
+#: plugins/personal/environment/environment.tpl:131
 msgid "Mount path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:133
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
@@ -2557,7 +2560,7 @@ msgstr ""
 #: plugins/admin/groups/class_groupMail.inc:582
 #: plugins/admin/applications/class_applicationParameters.inc:108
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:147
+#: plugins/admin/systems/workstationStartup.tpl:165
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/goSpamServer.tpl:37
@@ -2566,44 +2569,44 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:159
+#: plugins/personal/environment/environment.tpl:139
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:160
+#: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:164
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:185
+#: plugins/personal/environment/environment.tpl:165
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:196
+#: plugins/personal/environment/environment.tpl:176
 #: plugins/admin/groups/class_divListGroup.inc:93
 #: plugins/gofon/macro/class_divListMacros.inc:74
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:197
+#: plugins/personal/environment/environment.tpl:177
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:205
+#: plugins/personal/environment/environment.tpl:185
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:215
+#: plugins/personal/environment/environment.tpl:195
 msgid "Toggle admin"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:217
-#: plugins/personal/environment/environment.tpl:219
+#: plugins/personal/environment/environment.tpl:197
+#: plugins/personal/environment/environment.tpl:199
 msgid "Toggle default"
 msgstr ""
 
@@ -2649,9 +2652,10 @@ msgstr ""
 #: plugins/admin/systems/component.tpl:30 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/systems/ArpNewDevice.tpl:17
 #: plugins/admin/mimetypes/paste_generic.tpl:21
 #: plugins/admin/mimetypes/generic.tpl:30 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:64
+#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:73
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3167,89 +3171,89 @@ msgstr ""
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1025
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1033
+#: plugins/personal/generic/class_user.inc:1030
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1039
-#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/personal/generic/class_user.inc:1036
+#: plugins/addons/addressbook/class_addressbook.inc:566
 #: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1048
+#: plugins/personal/generic/class_user.inc:1045
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1054
-#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/personal/generic/class_user.inc:1051
+#: plugins/addons/addressbook/class_addressbook.inc:570
 #: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1057
+#: plugins/personal/generic/class_user.inc:1054
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1062
+#: plugins/personal/generic/class_user.inc:1059
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1069
+#: plugins/personal/generic/class_user.inc:1066
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1072
+#: plugins/personal/generic/class_user.inc:1069
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1075
-#: plugins/personal/generic/class_user.inc:1100
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/addons/addressbook/class_addressbook.inc:593
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/personal/generic/class_user.inc:1097
+#: plugins/addons/addressbook/class_addressbook.inc:576
+#: plugins/addons/addressbook/class_addressbook.inc:604
 #: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1078
-#: plugins/personal/generic/class_user.inc:1097
-#: plugins/addons/addressbook/class_addressbook.inc:568
-#: plugins/addons/addressbook/class_addressbook.inc:590
+#: plugins/personal/generic/class_user.inc:1075
+#: plugins/personal/generic/class_user.inc:1094
+#: plugins/addons/addressbook/class_addressbook.inc:579
+#: plugins/addons/addressbook/class_addressbook.inc:601
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1083
-#: plugins/addons/addressbook/class_addressbook.inc:573
-#: plugins/addons/addressbook/class_addressbook.inc:576
+#: plugins/personal/generic/class_user.inc:1080
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/addons/addressbook/class_addressbook.inc:587
 #: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1086
-#: plugins/addons/addressbook/class_addressbook.inc:579
+#: plugins/personal/generic/class_user.inc:1083
+#: plugins/addons/addressbook/class_addressbook.inc:590
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1089
-#: plugins/addons/addressbook/class_addressbook.inc:582
+#: plugins/personal/generic/class_user.inc:1086
+#: plugins/addons/addressbook/class_addressbook.inc:593
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1092
-#: plugins/addons/addressbook/class_addressbook.inc:585
+#: plugins/personal/generic/class_user.inc:1089
+#: plugins/addons/addressbook/class_addressbook.inc:596
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1219
+#: plugins/personal/generic/class_user.inc:1216
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -3927,7 +3931,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:132
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/macro/class_divListMacros.inc:95
@@ -3984,7 +3988,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:195
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:198
 msgid "Type"
 msgstr ""
 
@@ -4058,7 +4062,8 @@ msgid "Alternate fax numbers will not be copied"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:48 html/getxls.php:65
+#: plugins/admin/ogroups/phonequeue.tpl:48
+#: plugins/gofon/conference/generic.tpl:54 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -4158,68 +4163,68 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:161
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:164
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:233
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:234
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:446
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:528
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:447
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:529
 #: plugins/admin/groups/class_groupApplication.inc:657
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:142
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:146
 msgid "back"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:633
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:634
 msgid "Removing FAX account failed"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:648
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:649
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:661
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:662
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:663
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:668
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:669
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:751
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:752
 msgid "Saving FAX account failed"
 msgstr ""
 
@@ -4238,7 +4243,7 @@ msgstr ""
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_printGeneric.inc:868
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
@@ -4394,10 +4399,10 @@ msgid "Dial connection..."
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:369
-#: plugins/addons/addressbook/class_addressbook.inc:376
-#: plugins/addons/addressbook/class_addressbook.inc:380
-#: plugins/addons/addressbook/class_addressbook.inc:462
+#: plugins/addons/addressbook/class_addressbook.inc:379
+#: plugins/addons/addressbook/class_addressbook.inc:387
+#: plugins/addons/addressbook/class_addressbook.inc:391
+#: plugins/addons/addressbook/class_addressbook.inc:473
 msgid "Dial"
 msgstr ""
 
@@ -4450,7 +4455,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:522
+#: plugins/addons/addressbook/class_addressbook.inc:533
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/addons/gotomasses/class_goto_task.inc:213
 #: plugins/addons/gotomasses/goto_task.tpl:103
@@ -4506,7 +4511,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:739
+#: plugins/admin/groups/class_groupApplication.inc:740
 msgid "Edit entry"
 msgstr ""
 
@@ -4587,34 +4592,34 @@ msgstr ""
 msgid "You're about to delete the entry %s."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:386
+#: plugins/addons/addressbook/class_addressbook.inc:397
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:390
+#: plugins/addons/addressbook/class_addressbook.inc:401
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:485
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:477
+#: plugins/addons/addressbook/class_addressbook.inc:488
 msgid "user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:492
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:483
+#: plugins/addons/addressbook/class_addressbook.inc:494
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:522
+#: plugins/addons/addressbook/class_addressbook.inc:533
 #: plugins/addons/mailqueue/class_mailqueue.inc:305
 #: plugins/addons/mailqueue/class_mailqueue.inc:370
 #: plugins/addons/logview/class_logview.inc:99
@@ -4622,40 +4627,40 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:533 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:523
+#: plugins/addons/addressbook/class_addressbook.inc:534
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:523
+#: plugins/addons/addressbook/class_addressbook.inc:534
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:524 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:535 html/getxls.php:174
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:524
+#: plugins/addons/addressbook/class_addressbook.inc:535
 #: setup/setup_migrate.tpl:215 html/getxls.php:80 html/getxls.php:108
 #: html/getxls.php:123 html/getxls.php:282 html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:606
+#: plugins/addons/addressbook/class_addressbook.inc:617
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:614
+#: plugins/addons/addressbook/class_addressbook.inc:625
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:659
+#: plugins/addons/addressbook/class_addressbook.inc:670
 msgid "Saving addressbook entry failed"
 msgstr ""
 
@@ -4842,7 +4847,7 @@ msgid "Configure DHCP"
 msgstr ""
 
 #: plugins/addons/gotomasses/goto_task.tpl:79
-#: plugins/admin/systems/class_systemManagement.inc:32
+#: plugins/admin/systems/class_systemManagement.inc:33
 msgid "Systems"
 msgstr ""
 
@@ -4930,7 +4935,7 @@ msgid "Show workstations"
 msgstr ""
 
 #: plugins/addons/gotomasses/class_target_list.inc:173
-#: plugins/admin/systems/class_systemManagement.inc:865
+#: plugins/admin/systems/class_systemManagement.inc:879
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
@@ -5432,11 +5437,11 @@ msgstr ""
 msgid "Creating FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:549
+#: plugins/admin/fai/class_faiScript.inc:538
 msgid "Removing FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:568
+#: plugins/admin/fai/class_faiScript.inc:557
 msgid "Saving FAI script failed"
 msgstr ""
 
@@ -5459,15 +5464,15 @@ msgstr ""
 msgid "Saving FAI template base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:481
+#: plugins/admin/fai/class_faiTemplate.inc:470
 msgid "Removing FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/fai/class_faiTemplate.inc:475
 msgid "Modifying FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:499
+#: plugins/admin/fai/class_faiTemplate.inc:488
 msgid "Creating FAI template entry failed"
 msgstr ""
 
@@ -5486,8 +5491,8 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:179
 #: plugins/admin/fai/class_faiManagement.inc:225
-#: plugins/admin/systems/class_systemManagement.inc:407
-#: plugins/admin/systems/class_systemManagement.inc:467
+#: plugins/admin/systems/class_systemManagement.inc:410
+#: plugins/admin/systems/class_systemManagement.inc:470
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
@@ -5517,8 +5522,8 @@ msgstr ""
 #: plugins/admin/fai/class_faiManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:625
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:426
+#: plugins/admin/departments/class_departmentGeneric.inc:518
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: include/sieve/templates/add_element.tpl:11
 #: include/sieve/templates/select_test_type.tpl:11 setup/class_setup.inc:266
@@ -5650,16 +5655,19 @@ msgid "Package"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:39
+#: plugins/admin/fai/class_divListFai.inc:177
 msgid "Scripts"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 #: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_divListFai.inc:175
 #: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Partition table"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:44
+#: plugins/admin/fai/class_divListFai.inc:176
 msgid "Package list"
 msgstr ""
 
@@ -5798,20 +5806,20 @@ msgstr ""
 msgid "Saving FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:554
+#: plugins/admin/fai/class_faiPackage.inc:549
 msgid "Saving FAI package entry failed"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33
 #: plugins/admin/systems/workstationStartup.tpl:46
-#: plugins/admin/systems/workstationStartup.tpl:76
+#: plugins/admin/systems/workstationStartup.tpl:82
 #: plugins/admin/systems/class_servRepository.inc:281
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 msgid "Release"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:408
+#: plugins/admin/systems/class_printerPPDDialog.inc:402
 #: plugins/admin/systems/dhcpNewSection.tpl:9
 msgid "Section"
 msgstr ""
@@ -5828,7 +5836,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:74 include/functions.inc:660
+#: plugins/admin/fai/faiPackage.tpl:74 include/functions.inc:679
 msgid "Configure"
 msgstr ""
 
@@ -5895,7 +5903,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:305
 #: plugins/admin/systems/class_glpiSelectUser.inc:158
-#: plugins/admin/systems/class_servDNSeditZone.inc:323
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/phonequeue.tpl:21
 #: include/sieve/templates/object_container.tpl:8
@@ -5906,7 +5914,7 @@ msgid "Up"
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:306
-#: plugins/admin/systems/class_servDNSeditZone.inc:324
+#: plugins/admin/systems/class_servDNSeditZone.inc:345
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: include/sieve/templates/object_container.tpl:12
 #: include/sieve/templates/object_container_clear.tpl:12
@@ -6237,6 +6245,10 @@ msgstr ""
 msgid "PK"
 msgstr ""
 
+#: plugins/admin/fai/class_divListFai.inc:180
+msgid "Profile"
+msgstr ""
+
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:196
@@ -6348,21 +6360,21 @@ msgstr ""
 msgid "Saving FAI partition table base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:415
+#: plugins/admin/fai/class_faiPartitionTable.inc:408
 msgid "Removing FAI partition table failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:423
-#: plugins/admin/fai/class_faiPartitionTable.inc:432
+#: plugins/admin/fai/class_faiPartitionTable.inc:416
+#: plugins/admin/fai/class_faiPartitionTable.inc:425
 msgid "Saving FAI partition table failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:505
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
 msgid "Removing FAI partition table entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:535
-#: plugins/admin/fai/class_faiPartitionTable.inc:549
+#: plugins/admin/fai/class_faiPartitionTable.inc:524
+#: plugins/admin/fai/class_faiPartitionTable.inc:538
 msgid "Saving FAI partition table entry failed"
 msgstr ""
 
@@ -6411,12 +6423,12 @@ msgstr ""
 msgid "Saving FAI variable base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:381
+#: plugins/admin/fai/class_faiVariable.inc:370
 msgid "Removing FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:388
-#: plugins/admin/fai/class_faiVariable.inc:400
+#: plugins/admin/fai/class_faiVariable.inc:377
+#: plugins/admin/fai/class_faiVariable.inc:389
 msgid "Saving FAI variable failed"
 msgstr ""
 
@@ -6562,7 +6574,7 @@ msgid "Template attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:29
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:195
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:198
 msgid "File"
 msgstr ""
 
@@ -6590,8 +6602,8 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_dhcpNewSectionDialog.inc:30
 #: plugins/admin/systems/class_servDHCP.inc:38
-#: plugins/admin/systems/class_printGeneric.inc:853
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:863
+#: plugins/admin/systems/class_printGeneric.inc:865
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -6647,47 +6659,55 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:442
+#: plugins/admin/groups/acl_definition.inc:257
+msgid "Enable vacation message"
+msgstr ""
+
+#: plugins/admin/groups/acl_definition.inc:259
+msgid "Vacation start/stop"
+msgstr ""
+
+#: plugins/admin/groups/acl_definition.inc:444
 msgid "Scalix Mail node"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:443
+#: plugins/admin/groups/acl_definition.inc:445
 msgid "Mailbox class"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:444
+#: plugins/admin/groups/acl_definition.inc:446
 msgid "Server language"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:446
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Mailbox administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Mailbox size limitations"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:449
+#: plugins/admin/groups/acl_definition.inc:451
 msgid "Limit outbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:452
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:453
 msgid "Notify user"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Create/edit new task"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:455
 msgid "Remove tasks"
 msgstr ""
 
@@ -6894,7 +6914,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:127
 #: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:117
+#: plugins/admin/ogroups/tabs_ogroups.inc:119
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
@@ -6966,100 +6986,100 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:335
+#: plugins/admin/groups/class_groupMail.inc:336
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:359
+#: plugins/admin/groups/class_groupMail.inc:360
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/admin/groups/class_groupMail.inc:361
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:415
+#: plugins/admin/groups/class_groupMail.inc:417
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
-#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:620
 msgid "Unspecified"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:614
 msgid "Mails"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:615
 msgid "Tasks"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/admin/groups/class_groupMail.inc:615
 msgid "Journals"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Calendar"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/groups/class_groupMail.inc:616
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 msgid "Contacts"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:616
+#: plugins/admin/groups/class_groupMail.inc:617
 msgid "Notes"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/groups/class_groupMail.inc:620
 msgid "Inbox"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:621
 msgid "Drafts"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:620
+#: plugins/admin/groups/class_groupMail.inc:621
 msgid "Sent items"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:621
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Junk mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:623
+#: plugins/admin/groups/class_groupMail.inc:624
 #: include/sieve/class_sieveElement_If.inc:27
 #: include/sieve/class_sieveElement_If.inc:33
 msgid "Default"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:675
+#: plugins/admin/groups/class_groupMail.inc:676
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:877
+#: plugins/admin/groups/class_groupMail.inc:898
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:906
+#: plugins/admin/groups/class_groupMail.inc:928
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:939
+#: plugins/admin/groups/class_groupMail.inc:961
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:943
+#: plugins/admin/groups/class_groupMail.inc:965
 msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:503
-#: include/class_ldap.inc:466
+#: plugins/admin/departments/class_departmentGeneric.inc:498
+#: include/class_ldap.inc:474
 msgid "Object"
 msgstr ""
 
@@ -7256,54 +7276,54 @@ msgid "application"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:702
-#: plugins/admin/groups/class_groupApplication.inc:738
+#: plugins/admin/groups/class_groupApplication.inc:739
 msgid "Delete entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:706
-#: plugins/admin/groups/class_groupApplication.inc:736
+#: plugins/admin/groups/class_groupApplication.inc:737
 #: include/sieve/templates/object_container.tpl:9
 #: include/sieve/templates/object_container_clear.tpl:9
 msgid "Move up"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:707
-#: plugins/admin/groups/class_groupApplication.inc:737
+#: plugins/admin/groups/class_groupApplication.inc:738
 #: include/sieve/templates/object_container.tpl:13
 #: include/sieve/templates/object_container_clear.tpl:13
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:734
+#: plugins/admin/groups/class_groupApplication.inc:735
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:762
+#: plugins/admin/groups/class_groupApplication.inc:763
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:765
+#: plugins/admin/groups/class_groupApplication.inc:766
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:769
+#: plugins/admin/groups/class_groupApplication.inc:770
 msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:771
+#: plugins/admin/groups/class_groupApplication.inc:772
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:864
+#: plugins/admin/groups/class_groupApplication.inc:866
 msgid "Removing application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:909
+#: plugins/admin/groups/class_groupApplication.inc:915
 msgid "Saving application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:952
+#: plugins/admin/groups/class_groupApplication.inc:958
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -7363,7 +7383,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:863
+#: plugins/admin/systems/class_systemManagement.inc:877
 msgid "Template"
 msgstr ""
 
@@ -7758,7 +7778,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:69
+#: plugins/gofon/conference/generic.tpl:78
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -7771,7 +7791,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:135
+#: plugins/gofon/conference/generic.tpl:144
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -7846,17 +7866,17 @@ msgstr ""
 msgid "Saving department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:382
+#: plugins/admin/departments/class_departmentGeneric.inc:377
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:470
+#: plugins/admin/departments/class_departmentGeneric.inc:465
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:501
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
@@ -7878,19 +7898,15 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:333
-msgid ".."
-msgstr ""
-
 #: plugins/admin/systems/class_terminalInfo.inc:49
-#: plugins/admin/systems/class_terminalInfo.inc:194
+#: plugins/admin/systems/class_terminalInfo.inc:199
 msgid "present"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:62
-#: plugins/admin/systems/class_workstationService.inc:247
-#: plugins/admin/systems/class_workstationStartup.inc:530
-#: plugins/admin/systems/class_terminalService.inc:255
+#: plugins/admin/systems/class_workstationService.inc:243
+#: plugins/admin/systems/class_workstationStartup.inc:545
+#: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:168
 #: plugins/admin/systems/class_terminalGeneric.inc:251
 msgid "This 'dn' has no terminal features."
@@ -7901,7 +7917,7 @@ msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:75
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:174
 msgid "unknown status"
 msgstr ""
 
@@ -7909,19 +7925,19 @@ msgstr ""
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:102
+#: plugins/admin/systems/class_terminalInfo.inc:101
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:158
+#: plugins/admin/systems/class_terminalInfo.inc:163
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:161
+#: plugins/admin/systems/class_terminalInfo.inc:166
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:186
+#: plugins/admin/systems/class_terminalInfo.inc:191
 msgid "offline"
 msgstr ""
 
@@ -8032,7 +8048,7 @@ msgstr ""
 msgid "Enable DHCP for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:41 plugins/admin/systems/network.tpl:116
+#: plugins/admin/systems/network.tpl:41 plugins/admin/systems/network.tpl:120
 msgid "not configured"
 msgstr ""
 
@@ -8044,21 +8060,21 @@ msgstr ""
 msgid "Edit settings"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:85 plugins/admin/systems/network.tpl:116
+#: plugins/admin/systems/network.tpl:88 plugins/admin/systems/network.tpl:120
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:94
+#: plugins/admin/systems/network.tpl:98
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:102
-#: plugins/admin/systems/servdnseditzone.tpl:94
+#: plugins/admin/systems/network.tpl:106
+#: plugins/admin/systems/servdnseditzone.tpl:101
 #: plugins/admin/systems/class_servDNS.inc:250
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:107
+#: plugins/admin/systems/network.tpl:111
 msgid "Dns records"
 msgstr ""
 
@@ -8347,80 +8363,80 @@ msgstr ""
 msgid "Please enter a new name"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:87
+#: plugins/admin/systems/class_workstationService.inc:85
 #: plugins/admin/systems/workstationService.tpl:121
-#: plugins/admin/systems/class_terminalService.inc:65
+#: plugins/admin/systems/class_terminalService.inc:64
 msgid "unknown"
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_workstationService.inc:89
 #: plugins/admin/systems/class_workstationService.inc:90
 #: plugins/admin/systems/class_workstationService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:93
+#: plugins/admin/systems/class_terminalService.inc:96
 #: plugins/admin/systems/class_terminalService.inc:97
 #: plugins/admin/systems/class_terminalService.inc:98
 #: plugins/admin/systems/class_terminalService.inc:99
-#: plugins/admin/systems/class_terminalService.inc:100
 msgid "bit"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:133
-#: plugins/admin/systems/class_terminalService.inc:152
+#: plugins/admin/systems/class_workstationService.inc:131
+#: plugins/admin/systems/class_terminalService.inc:151
 msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:134
-#: plugins/admin/systems/class_terminalService.inc:153
+#: plugins/admin/systems/class_workstationService.inc:132
+#: plugins/admin/systems/class_terminalService.inc:152
 msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:137
-#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:135
+#: plugins/admin/systems/class_terminalService.inc:155
 msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:140
-#: plugins/admin/systems/class_terminalService.inc:159
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
 msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:141
-#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:196
-#: plugins/admin/systems/class_workstationService.inc:199
-#: plugins/admin/systems/class_workstationService.inc:202
-#: plugins/admin/systems/class_workstationService.inc:205
-#: plugins/admin/systems/class_workstationService.inc:208
-#: plugins/admin/systems/class_workstationService.inc:211
-#: plugins/admin/systems/class_workstationService.inc:214
+#: plugins/admin/systems/class_workstationService.inc:192
+#: plugins/admin/systems/class_workstationService.inc:195
+#: plugins/admin/systems/class_workstationService.inc:198
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:220
+#: plugins/admin/systems/class_workstationService.inc:221
+#: plugins/admin/systems/class_workstationService.inc:222
+#: plugins/admin/systems/class_workstationService.inc:223
 #: plugins/admin/systems/class_workstationService.inc:224
 #: plugins/admin/systems/class_workstationService.inc:225
 #: plugins/admin/systems/class_workstationService.inc:226
-#: plugins/admin/systems/class_workstationService.inc:227
-#: plugins/admin/systems/class_workstationService.inc:228
-#: plugins/admin/systems/class_workstationService.inc:229
-#: plugins/admin/systems/class_workstationService.inc:230
-#: plugins/admin/systems/class_workstationStartup.inc:339
-#: plugins/admin/systems/class_workstationStartup.inc:343
-#: plugins/admin/systems/class_workstationStartup.inc:857
+#: plugins/admin/systems/class_workstationStartup.inc:347
+#: plugins/admin/systems/class_workstationStartup.inc:351
+#: plugins/admin/systems/class_workstationStartup.inc:872
 #: plugins/admin/systems/class_workstationGeneric.inc:140
-#: plugins/admin/systems/class_terminalService.inc:68
-#: plugins/admin/systems/class_terminalService.inc:96
-#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:67
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:111
 #: plugins/admin/systems/class_terminalService.inc:112
-#: plugins/admin/systems/class_terminalService.inc:113
-#: plugins/admin/systems/class_terminalService.inc:115
-#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:114
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:209
 #: plugins/admin/systems/class_terminalService.inc:212
 #: plugins/admin/systems/class_terminalService.inc:215
 #: plugins/admin/systems/class_terminalService.inc:218
 #: plugins/admin/systems/class_terminalService.inc:221
 #: plugins/admin/systems/class_terminalService.inc:224
 #: plugins/admin/systems/class_terminalService.inc:227
-#: plugins/admin/systems/class_terminalService.inc:230
 #: plugins/admin/systems/class_terminalStartup.inc:119
 #: plugins/admin/systems/class_terminalStartup.inc:139
 #: plugins/admin/systems/class_terminalStartup.inc:142
@@ -8429,31 +8445,31 @@ msgstr ""
 msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:199
-#: plugins/admin/systems/class_terminalService.inc:215
+#: plugins/admin/systems/class_workstationService.inc:195
+#: plugins/admin/systems/class_terminalService.inc:212
 msgid "Bit"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:297
-#: plugins/admin/systems/class_terminalService.inc:306
+#: plugins/admin/systems/class_workstationService.inc:293
+#: plugins/admin/systems/class_terminalService.inc:303
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:365
-#: plugins/admin/systems/class_workstationService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_terminalService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:361
+#: plugins/admin/systems/class_workstationService.inc:366
+#: plugins/admin/systems/class_terminalService.inc:387
+#: plugins/admin/systems/class_terminalService.inc:392
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:405
-#: plugins/admin/systems/class_terminalService.inc:410
+#: plugins/admin/systems/class_workstationService.inc:376
+#: plugins/admin/systems/class_workstationService.inc:381
+#: plugins/admin/systems/class_terminalService.inc:402
+#: plugins/admin/systems/class_terminalService.inc:407
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:428
+#: plugins/admin/systems/class_workstationService.inc:424
 msgid "Saving workstation services failed"
 msgstr ""
 
@@ -8600,7 +8616,7 @@ msgstr ""
 msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:364
+#: plugins/admin/systems/class_workstationStartup.inc:372
 #: plugins/admin/systems/class_terminalStartup.inc:88
 #, php-format
 msgid ""
@@ -8608,34 +8624,34 @@ msgid ""
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:465
+#: plugins/admin/systems/class_workstationStartup.inc:481
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:510
+#: plugins/admin/systems/class_workstationStartup.inc:526
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:570
+#: plugins/admin/systems/class_workstationStartup.inc:585
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:764
+#: plugins/admin/systems/class_workstationStartup.inc:779
 msgid "Not available in current setup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:931
+#: plugins/admin/systems/class_workstationStartup.inc:953
 #, 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:944
+#: plugins/admin/systems/class_workstationStartup.inc:966
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -8643,17 +8659,17 @@ msgid ""
 "reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1115
+#: plugins/admin/systems/class_workstationStartup.inc:1137
 msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1165
+#: plugins/admin/systems/class_workstationStartup.inc:1187
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1167
+#: plugins/admin/systems/class_workstationStartup.inc:1189
 #: plugins/admin/systems/class_servRepositorySetup.inc:184
 #, php-format
 msgid ""
@@ -8688,7 +8704,7 @@ msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:198
-#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/systems/class_printerPPDDialog.inc:266
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
@@ -8710,56 +8726,51 @@ msgid ""
 "informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:262
-#, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:283
+#: plugins/admin/systems/class_printerPPDDialog.inc:276
 #, php-format
 msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:287
+#: plugins/admin/systems/class_printerPPDDialog.inc:280
 msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:461
-#: plugins/admin/systems/class_printerPPDDialog.inc:464
+#: plugins/admin/systems/class_printerPPDDialog.inc:455
+#: plugins/admin/systems/class_printerPPDDialog.inc:458
 #: include/sieve/class_sieveElement_If.inc:915
 #: include/sieve/class_sieveManagement.inc:609
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:462
-#: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/systems/class_printerPPDDialog.inc:456
+#: plugins/admin/systems/class_printerPPDDialog.inc:459
 #: include/sieve/class_sieveElement_If.inc:915
 #: include/sieve/class_sieveManagement.inc:610
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:470
+#: plugins/admin/systems/class_printerPPDDialog.inc:464
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:487
+#: plugins/admin/systems/class_printerPPDDialog.inc:481
 #, php-format
 msgid "Removing old ppd file '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:490
+#: plugins/admin/systems/class_printerPPDDialog.inc:484
 #, php-format
 msgid "Removing old ppd file '%s' failed. File is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:493
+#: plugins/admin/systems/class_printerPPDDialog.inc:487
 #, php-format
 msgid ""
 "Removing old ppd file '%s' failed. File does not exists or is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:501
+#: plugins/admin/systems/class_printerPPDDialog.inc:500
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
@@ -8822,30 +8833,30 @@ msgid "LDAP server"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:42
-#: plugins/admin/systems/workstationStartup.tpl:72
+#: plugins/admin/systems/workstationStartup.tpl:78
 msgid "FAI server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:64
-#: plugins/admin/systems/workstationStartup.tpl:96
+#: plugins/admin/systems/workstationStartup.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:114
 msgid "Assigned FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:86
+#: plugins/admin/systems/workstationStartup.tpl:98
 msgid "set"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:118
+#: plugins/admin/systems/workstationStartup.tpl:136
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:120
+#: plugins/admin/systems/workstationStartup.tpl:138
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:145
+#: plugins/admin/systems/workstationStartup.tpl:163
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr ""
@@ -9124,26 +9135,34 @@ msgstr ""
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:404
-#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_workstationGeneric.inc:391
+#: plugins/admin/systems/class_componentGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:427
+#: plugins/admin/systems/class_servGeneric.inc:250
+#: plugins/admin/systems/class_phoneGeneric.inc:308
+msgid "Please specify a valid name for this object."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:409
+#: plugins/admin/systems/class_componentGeneric.inc:182
 #: plugins/admin/systems/class_winGeneric.inc:188
-#: plugins/admin/systems/class_terminalGeneric.inc:443
-#: plugins/admin/systems/class_servGeneric.inc:263
-#: plugins/admin/systems/class_printGeneric.inc:672
-#: plugins/admin/systems/class_phoneGeneric.inc:325
+#: plugins/admin/systems/class_terminalGeneric.inc:448
+#: plugins/admin/systems/class_servGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:677
+#: plugins/admin/systems/class_phoneGeneric.inc:330
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:415
-#: plugins/admin/systems/class_terminalGeneric.inc:453
+#: plugins/admin/systems/class_workstationGeneric.inc:420
+#: plugins/admin/systems/class_terminalGeneric.inc:458
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:487
-#: plugins/admin/systems/class_workstationGeneric.inc:511
+#: plugins/admin/systems/class_workstationGeneric.inc:492
+#: plugins/admin/systems/class_workstationGeneric.inc:516
 #: plugins/admin/ogroups/class_termgroup.inc:334
 msgid "Saving workstation failed"
 msgstr ""
@@ -9214,7 +9233,7 @@ msgid "New Terminal template"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:95
-#: plugins/admin/systems/class_systemManagement.inc:876
+#: plugins/admin/systems/class_systemManagement.inc:890
 msgid "New Terminal"
 msgstr ""
 
@@ -9223,7 +9242,7 @@ msgid "New Workstation template"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:97
-#: plugins/admin/systems/class_systemManagement.inc:877
+#: plugins/admin/systems/class_systemManagement.inc:891
 msgid "New Workstation"
 msgstr ""
 
@@ -9641,7 +9660,7 @@ msgstr ""
 #: plugins/admin/systems/class_dhcpNewSectionDialog.inc:26
 #: plugins/admin/systems/class_servDHCP.inc:34
 #: plugins/admin/systems/class_servDHCP.inc:312
-#: plugins/admin/systems/class_servDHCP.inc:598
+#: plugins/admin/systems/class_servDHCP.inc:604
 msgid "Global options"
 msgstr ""
 
@@ -9774,22 +9793,22 @@ msgstr ""
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:158
 #: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:156
+#: plugins/admin/systems/class_componentGeneric.inc:161
 #: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The field IP address contains an invalid address."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:169
 #: plugins/admin/systems/class_winGeneric.inc:175
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:236
+#: plugins/admin/systems/class_componentGeneric.inc:241
 msgid "Saving generic component failed"
 msgstr ""
 
@@ -9944,86 +9963,82 @@ msgstr ""
 msgid "Mime-type"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:190
+#: plugins/admin/systems/class_termDNS.inc:191
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:327
 msgid "Not matching"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:420
-msgid "You have not configured your dhcp settings yet."
-msgstr ""
-
-#: plugins/admin/systems/class_termDNS.inc:430
+#: plugins/admin/systems/class_termDNS.inc:436
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:437
+#: plugins/admin/systems/class_termDNS.inc:443
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:443
+#: plugins/admin/systems/class_termDNS.inc:449
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:449
+#: plugins/admin/systems/class_termDNS.inc:455
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:462
+#: plugins/admin/systems/class_termDNS.inc:468
 #, php-format
 msgid ""
 "The specified IP address '%s' is not matching the selected reverse zone "
 "entry '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:483
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:485
+#: plugins/admin/systems/class_termDNS.inc:491
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:496
+#: plugins/admin/systems/class_termDNS.inc:502
 #, 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:503
-#: plugins/admin/systems/class_servDNSeditZone.inc:437
+#: plugins/admin/systems/class_termDNS.inc:509
+#: plugins/admin/systems/class_servDNSeditZone.inc:462
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:547
+#: plugins/admin/systems/class_termDNS.inc:578
 msgid "Removing dhcp entry for this object failed."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:559
-#: plugins/admin/systems/class_termDNS.inc:574
+#: plugins/admin/systems/class_termDNS.inc:602
+#: plugins/admin/systems/class_termDNS.inc:621
 msgid "Tried to add new dhcp entry failed."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:577
+#: plugins/admin/systems/class_termDNS.inc:624
 msgid "Removing old dhcp entry failed."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:589
+#: plugins/admin/systems/class_termDNS.inc:640
 msgid "Modifying dhcp entry failed."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:656
+#: plugins/admin/systems/class_termDNS.inc:707
 msgid "Saving terminal to DNS object failed"
 msgstr ""
 
@@ -10191,45 +10206,49 @@ msgstr ""
 msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:33
+#: plugins/admin/systems/servdnseditzone.tpl:30
+msgid "Zone is in use, network settings can't be modified."
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:40
 msgid "Zone records"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:36
+#: plugins/admin/systems/servdnseditzone.tpl:43
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:48
+#: plugins/admin/systems/servdnseditzone.tpl:55
 msgid "SOA record"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:54
+#: plugins/admin/systems/servdnseditzone.tpl:61
 msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:66
+#: plugins/admin/systems/servdnseditzone.tpl:73
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:76
+#: plugins/admin/systems/servdnseditzone.tpl:83
+#: plugins/gofon/phoneaccount/generic.tpl:86
 msgid "Refresh"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:82
+#: plugins/admin/systems/servdnseditzone.tpl:89
 #: plugins/admin/ogroups/phonequeue.tpl:67
 msgid "Retry"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:88
+#: plugins/admin/systems/servdnseditzone.tpl:95
 msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:109
+#: plugins/admin/systems/servdnseditzone.tpl:116
 msgid "MxRecords"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:121
+#: plugins/admin/systems/servdnseditzone.tpl:128
 msgid "Global zone records"
 msgstr ""
 
@@ -10288,11 +10307,11 @@ msgid ""
 "This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:151
+#: plugins/admin/systems/class_terminalService.inc:150
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:448
 msgid "Saving terminal service information failed"
 msgstr ""
 
@@ -10333,7 +10352,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:146 setup/class_setupStep_Config3.inc:80
+#: setup/class_setupStep_Config2.inc:144 setup/class_setupStep_Config3.inc:82
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10350,7 +10369,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:146 setup/class_setupStep_Config3.inc:80
+#: setup/class_setupStep_Config2.inc:144 setup/class_setupStep_Config3.inc:82
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -10595,7 +10614,7 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:537
+#: plugins/admin/systems/class_terminalGeneric.inc:542
 msgid "Saving terminal failed"
 msgstr ""
 
@@ -10801,11 +10820,11 @@ msgstr ""
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:252
+#: plugins/admin/systems/class_servGeneric.inc:257
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:327
 msgid "Saving server failed"
 msgstr ""
 
@@ -10901,15 +10920,15 @@ msgid "Can't remove DHCP object!"
 msgstr ""
 
 #: plugins/admin/systems/class_servDHCP.inc:534
-#: plugins/admin/systems/class_servDHCP.inc:537
+#: plugins/admin/systems/class_servDHCP.inc:540
 msgid "Can't save DHCP object!"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:559
+#: plugins/admin/systems/class_servDHCP.inc:565
 msgid "Saving DHCP service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:675
+#: plugins/admin/systems/class_servDHCP.inc:681
 msgid ""
 "DHCP configuration set is unknown. Please contact your system administrator."
 msgstr ""
@@ -11002,7 +11021,7 @@ msgid "Allow booting"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:105
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
 msgid "New entry"
 msgstr ""
 
@@ -11053,98 +11072,102 @@ msgstr ""
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:220
+#: plugins/admin/systems/class_systemManagement.inc:223
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:292
+#: plugins/admin/systems/class_systemManagement.inc:295
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:299
+#: plugins/admin/systems/class_systemManagement.inc:302
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:330
+#: plugins/admin/systems/class_systemManagement.inc:333
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:347
+#: plugins/admin/systems/class_systemManagement.inc:350
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:404
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:500
+#: plugins/admin/systems/class_systemManagement.inc:503
 #, php-format
 msgid ""
 "Can't set gotoMode to status 'active', the current object couldn't be "
 "identified."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:744
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:748
+msgid "Unknown device"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:750
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
+#: plugins/admin/systems/class_systemManagement.inc:771
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:774
+#: plugins/admin/systems/class_systemManagement.inc:783
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:862
+#: plugins/admin/systems/class_systemManagement.inc:876
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:864
+#: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:866
+#: plugins/admin/systems/class_systemManagement.inc:880
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:867
+#: plugins/admin/systems/class_systemManagement.inc:881
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:868
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:885
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:872
+#: plugins/admin/systems/class_systemManagement.inc:886
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:873
+#: plugins/admin/systems/class_systemManagement.inc:887
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:874
+#: plugins/admin/systems/class_systemManagement.inc:888
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:875
+#: plugins/admin/systems/class_systemManagement.inc:889
 msgid "Network Device"
 msgstr ""
 
@@ -11154,19 +11177,13 @@ msgid ""
 "single list."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
-msgstr ""
-
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:5
 msgid ""
 "This dialog can't be used until the currently edited zone was saved or the "
 "zone entry exists in the ldap database."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
 msgid "Create a new DNS zone entry"
 msgstr ""
 
@@ -11180,7 +11197,7 @@ msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
 #: plugins/admin/ogroups/class_phonequeue.inc:889
-#: plugins/gofon/conference/generic.tpl:82 html/getxls.php:174
+#: plugins/gofon/conference/generic.tpl:91 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
@@ -11223,16 +11240,16 @@ msgid ""
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:422
+#: plugins/admin/systems/class_servDNS.inc:430
 msgid "Updating DNS service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:433
+#: plugins/admin/systems/class_servDNS.inc:441
 msgid "Removing DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:456
-#: plugins/admin/systems/class_servDNS.inc:465
+#: plugins/admin/systems/class_servDNS.inc:464
+#: plugins/admin/systems/class_servDNS.inc:473
 msgid "Saving DNS entries failed"
 msgstr ""
 
@@ -11280,67 +11297,67 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:403
+#: plugins/admin/systems/class_servDNSeditZone.inc:428
 #, php-format
 msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:407
+#: plugins/admin/systems/class_servDNSeditZone.inc:432
 #, php-format
 msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:411
+#: plugins/admin/systems/class_servDNSeditZone.inc:436
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:415
+#: plugins/admin/systems/class_servDNSeditZone.inc:440
 msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:419
+#: plugins/admin/systems/class_servDNSeditZone.inc:444
 msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:423
+#: plugins/admin/systems/class_servDNSeditZone.inc:448
 msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:427
+#: plugins/admin/systems/class_servDNSeditZone.inc:452
 msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:431
+#: plugins/admin/systems/class_servDNSeditZone.inc:456
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:446
+#: plugins/admin/systems/class_servDNSeditZone.inc:471
 msgid ""
 "The given network address is not a valid, please specify a valid IP address."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:453
+#: plugins/admin/systems/class_servDNSeditZone.inc:478
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.0.0.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:459
+#: plugins/admin/systems/class_servDNSeditZone.inc:484
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.x.0.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:465
+#: plugins/admin/systems/class_servDNSeditZone.inc:490
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.x.x.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:469
+#: plugins/admin/systems/class_servDNSeditZone.inc:494
 #, php-format
 msgid "The given network class '%s' is not valid."
 msgstr ""
@@ -11500,25 +11517,33 @@ msgstr ""
 msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:651
+#: plugins/admin/systems/class_printGeneric.inc:643
+msgid "The required field 'Printer name' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:648
+msgid "Invalid character in printer name."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:656
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:833
+#: plugins/admin/systems/class_printGeneric.inc:846
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:878
+#: plugins/admin/systems/class_printGeneric.inc:888
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:900
+#: plugins/admin/systems/class_printGeneric.inc:910
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:908
+#: plugins/admin/systems/class_printGeneric.inc:918
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -11958,11 +11983,11 @@ msgstr ""
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_phoneGeneric.inc:315
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:411
+#: plugins/admin/systems/class_phoneGeneric.inc:416
 msgid "Saving phone failed"
 msgstr ""
 
@@ -12091,6 +12116,31 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr ""
 
+#: plugins/admin/systems/ArpNewDevice.tpl:1
+msgid "Integrating unknown devices"
+msgstr ""
+
+#: plugins/admin/systems/ArpNewDevice.tpl:3
+msgid ""
+"The current device has been detected by the ARP monitor used by GOsa. You "
+"can integrate this device into your running DHCP/DNS infrastructure by "
+"submitting this form. The device entry will disapear from the list of the "
+"systems and move to the DNS/DHCP configuration."
+msgstr ""
+
+#: plugins/admin/systems/ArpNewDevice.tpl:9
+msgid "DNS name"
+msgstr ""
+
+#: plugins/admin/systems/class_ArpNewDevice.inc:47
+msgid "Please specify a valid dns name."
+msgstr ""
+
+#: plugins/admin/systems/class_ArpNewDevice.inc:69
+msgid ""
+"Could not remove arp-alert device after writing dns and dhcp configuration."
+msgstr ""
+
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:463
 #, php-format
 msgid "Saving of mime type/generic with dn '%s' failed."
@@ -12260,7 +12310,7 @@ msgid "Mimetype management"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:65
-#: plugins/admin/ogroups/tabs_ogroups.inc:199
+#: plugins/admin/ogroups/tabs_ogroups.inc:201
 msgid "Phone queue"
 msgstr ""
 
@@ -12268,7 +12318,7 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:178
+#: plugins/admin/ogroups/tabs_ogroups.inc:180
 msgid "Terminals"
 msgstr ""
 
@@ -12546,7 +12596,7 @@ msgid "Member objects"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:92
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:98
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
 "The specified home server '%s' is not available in GOsa server "
@@ -12580,16 +12630,16 @@ msgid "round robin with memory"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:148
-#: plugins/gofon/macro/class_gofonMacro.inc:172
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:265
+#: plugins/gofon/macro/class_gofonMacro.inc:175
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
 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:182
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:276
+#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:293
 #, php-format
 msgid ""
 "The MySQL home server '%s' isn't reachable as user '%s', check GOsa log for "
@@ -12597,14 +12647,14 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:166
-#: plugins/gofon/macro/class_gofonMacro.inc:189
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:283
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:300
 #, 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
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:312
 #, php-format
 msgid ""
 "The MySQL initial home server '%s' isn't reachable as user '%s', check GOsa "
@@ -12612,7 +12662,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:302
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:319
 #, php-format
 msgid "Can't select database '%s' on initial home server '%s'."
 msgstr ""
@@ -12643,7 +12693,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1180
 msgid "Please select a valid goFonHomeServer."
 msgstr ""
 
@@ -12669,9 +12719,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:305
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:904
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:374
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -12685,8 +12735,8 @@ msgstr ""
 #: 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
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:413
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:426
 msgid "Please have a look a the gosa logfiles."
 msgstr ""
 
@@ -12707,10 +12757,10 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1389
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1391
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:565
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1443
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1445
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:587
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:589
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
@@ -12979,91 +13029,91 @@ msgstr ""
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:219
+#: plugins/gofon/macro/class_gofonMacro.inc:223
 #, php-format
 msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:287
+#: plugins/gofon/macro/class_gofonMacro.inc:291
 #, php-format
 msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: 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:294
+#: plugins/gofon/macro/class_gofonMacro.inc:298
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:302
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:332
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:367
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:376
+#: plugins/gofon/macro/class_gofonMacro.inc:381
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:387
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:386
+#: plugins/gofon/macro/class_gofonMacro.inc:391
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:392
+#: plugins/gofon/macro/class_gofonMacro.inc:397
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:403
+#: plugins/gofon/macro/class_gofonMacro.inc:408
 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:411
+#: plugins/gofon/macro/class_gofonMacro.inc:416
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:429
+#: plugins/gofon/macro/class_gofonMacro.inc:434
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:442
+#: plugins/gofon/macro/class_gofonMacro.inc:447
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:448
+#: plugins/gofon/macro/class_gofonMacro.inc:453
 msgid "Removing phone macro failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:462
 msgid "Removing phone macro reverences failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:491
+#: plugins/gofon/macro/class_gofonMacro.inc:496
 msgid "Saving phone macro failed"
 msgstr ""
 
@@ -13114,7 +13164,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1157
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1210
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -13151,7 +13201,7 @@ msgstr ""
 msgid "type"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:103
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:105
 #, php-format
 msgid ""
 "The specified goFonHomeServer '%s' is not available in GOsa server "
@@ -13160,140 +13210,138 @@ msgid ""
 "accounts."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:155
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:157
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:173
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:175
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:302
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:313
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:422
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:433
 #, 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:430
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:441
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
 #, 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:449
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:460
 #, 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:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:786
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:951
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:864
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1000
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:846
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:890
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:961
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:962
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1011
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:965
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1014
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1017
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1015
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:969
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1018
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:982
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1031
+msgid ""
+"Please enter a valid phone number! Because of the realtime extension tables, "
+"the number must be less than 11 digits."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1070
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1176
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1127
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1184
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1130
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1187
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1135
-msgid "Phone PIN must be at least one character long."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1138
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1192
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1150
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1223
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1276
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1326
 #, 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:1284
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1337
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1315
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1369
 #: include/sieve/templates/object_container.tpl:30
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/class_sieveManagement.inc:514
@@ -13301,22 +13349,22 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1320
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1374
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1353
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1407
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1360
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1414
 msgid "Removing phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1437
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1491
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -13329,12 +13377,12 @@ msgid "Phone settings"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
-#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:52
 msgid "Voicemail PIN"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/paste_generic.tpl:40
-#: plugins/gofon/phoneaccount/generic.tpl:50
+#: plugins/gofon/phoneaccount/generic.tpl:60
 msgid "Phone PIN"
 msgstr ""
 
@@ -13342,8 +13390,16 @@ msgstr ""
 msgid "Select the accounts home server"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:68
-#: plugins/gofon/phoneaccount/generic.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:41
+msgid "Context"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Select the accounts context"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/phoneaccount/generic.tpl:79
 msgid "Phone macro"
 msgstr ""
 
@@ -13366,7 +13422,7 @@ msgid "Name - Number"
 msgstr ""
 
 #: plugins/gofon/conference/class_divListConferences.inc:48
-#: plugins/gofon/conference/generic.tpl:120
+#: plugins/gofon/conference/generic.tpl:129
 msgid "PIN"
 msgstr ""
 
@@ -13411,98 +13467,102 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:74
+#: plugins/gofon/conference/generic.tpl:57
+msgid "Select language"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:83
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:121
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:135
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:134
+#: plugins/gofon/conference/generic.tpl:143
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:151
+#: plugins/gofon/conference/generic.tpl:160
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:157
+#: plugins/gofon/conference/generic.tpl:166
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:163
+#: plugins/gofon/conference/generic.tpl:172
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:169
+#: plugins/gofon/conference/generic.tpl:178
 msgid "Count users"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:230
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:241
 #, 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
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:336
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:324
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:341
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:328
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:345
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:332
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:349
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:336
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:353
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:340
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
 msgid ""
 "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
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:425
 msgid ""
 "Can not remove entries with some telephone number and/or cn from destination "
 "home server."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:524
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
 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
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
 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:633
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:656
 msgid "Saving phone conference failed"
 msgstr ""
 
@@ -13803,25 +13863,29 @@ msgid "Else If"
 msgstr ""
 
 #: include/sieve/templates/object_container.tpl:38
-#: include/sieve/templates/object_container.tpl:42
+#: include/sieve/templates/object_container.tpl:43
 msgid "Add new"
 msgstr ""
 
 #: include/sieve/templates/object_container.tpl:38
 #: include/sieve/templates/object_container.tpl:40
+#: include/sieve/templates/object_container.tpl:41
 msgid "Add a new object above this one."
 msgstr ""
 
 #: include/sieve/templates/object_container.tpl:40
+#: include/sieve/templates/object_container.tpl:41
 msgid "Add element above"
 msgstr ""
 
-#: include/sieve/templates/object_container.tpl:42
-#: include/sieve/templates/object_container.tpl:44
+#: include/sieve/templates/object_container.tpl:43
+#: include/sieve/templates/object_container.tpl:45
+#: include/sieve/templates/object_container.tpl:46
 msgid "Add a new object below this one."
 msgstr ""
 
-#: include/sieve/templates/object_container.tpl:44
+#: include/sieve/templates/object_container.tpl:45
+#: include/sieve/templates/object_container.tpl:46
 msgid "Add element below"
 msgstr ""
 
@@ -14185,7 +14249,7 @@ msgstr ""
 #: include/sieve/class_sieveManagement.inc:355
 #: include/sieve/class_sieveManagement.inc:685
 #: include/sieve/class_sieveManagement.inc:1054
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:276
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
@@ -14281,50 +14345,50 @@ msgstr ""
 msgid "Please specify at least one valid requirement."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:40
+#: include/class_mail-methods-cyrus.inc:52
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:65
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:163
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:182
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:208
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:226
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:248
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:289
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:360
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:364
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -14333,55 +14397,55 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr ""
 
-#: include/class_plugin.inc:412
+#: include/class_plugin.inc:414
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:564
+#: include/class_plugin.inc:566
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:599 include/class_password-methods.inc:200
+#: include/class_plugin.inc:601 include/class_password-methods.inc:205
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:639
+#: include/class_plugin.inc:641
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:947
+#: include/class_plugin.inc:1008
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:954
+#: include/class_plugin.inc:1015
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:968 include/class_plugin.inc:997
+#: include/class_plugin.inc:1029 include/class_plugin.inc:1058
 msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:1045
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_password-methods.inc:184
+#: include/class_password-methods.inc:189
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:221
+#: include/class_password-methods.inc:226
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
@@ -14413,11 +14477,11 @@ msgstr ""
 msgid "No help available for this plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:187
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:191
 msgid "next"
 msgstr ""
 
@@ -14431,49 +14495,49 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_ppdManager.inc:13
+#: include/class_ppdManager.inc:14
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:144
+#: include/class_ppdManager.inc:145
 #, php-format
 msgid "Specified ppd file '%s' can't be opened for reading."
 msgstr ""
 
-#: include/class_ppdManager.inc:146
+#: include/class_ppdManager.inc:147
 #, php-format
 msgid "The required tmp file file '%s' can't be opened for writing."
 msgstr ""
 
-#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
+#: include/class_ppdManager.inc:171 include/class_ppdManager.inc:308
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:178
+#: include/class_ppdManager.inc:179
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:182
+#: include/class_ppdManager.inc:183
 msgid "Group name not unique!"
 msgstr ""
 
-#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
+#: include/class_ppdManager.inc:189 include/class_ppdManager.inc:219
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:212
+#: include/class_ppdManager.inc:213
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:237
+#: include/class_ppdManager.inc:238
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:318
+#: include/class_ppdManager.inc:329
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -14508,284 +14572,284 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/php_setup.inc:107
+#: include/php_setup.inc:110
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:115
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:115
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:117 html/main.php:385
+#: include/php_setup.inc:120 html/main.php:385
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:127
+#: include/php_setup.inc:130
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:146
+#: include/php_setup.inc:149
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:152
+#: include/php_setup.inc:155
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:157
+#: include/php_setup.inc:160
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:161
+#: include/php_setup.inc:164
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:194
+#: include/php_setup.inc:197
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:195
+#: include/php_setup.inc:198
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:196
+#: include/php_setup.inc:199
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:291
+#: include/functions.inc:293
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:308
+#: include/functions.inc:310
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:329
+#: include/functions.inc:342
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:461
+#: include/functions.inc:480
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:471
+#: include/functions.inc:490
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in %s! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:486
+#: include/functions.inc:505
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:512
+#: include/functions.inc:531
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:542
+#: include/functions.inc:561
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:552
+#: include/functions.inc:571
 #, php-format
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in %s!"
 msgstr ""
 
-#: include/functions.inc:560
+#: include/functions.inc:579
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:646
+#: include/functions.inc:665
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:648
+#: include/functions.inc:667
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:665
+#: include/functions.inc:684
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1108 include/functions.inc:1349
+#: include/functions.inc:1151 include/functions.inc:1392
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1109
+#: include/functions.inc:1152
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1117
+#: include/functions.inc:1160
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1177
+#: include/functions.inc:1220
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1238
+#: include/functions.inc:1281
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1240
+#: include/functions.inc:1283
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1285
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1531
+#: include/functions.inc:1574
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1559
+#: include/functions.inc:1602
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1833
+#: include/functions.inc:1876
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1876
+#: include/functions.inc:1919
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2278 include/functions.inc:2282
+#: include/functions.inc:2321 include/functions.inc:2325
 msgid "Warning - base_hook is not available. Using default base."
 msgstr ""
 
-#: include/functions.inc:2288
+#: include/functions.inc:2331
 msgid "Warning - no base_hook defined. Using default base."
 msgstr ""
 
-#: include/functions.inc:2313 setup/class_setupStep_Schema.inc:95
+#: include/functions.inc:2356 setup/class_setupStep_Schema.inc:95
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2339
+#: include/functions.inc:2382
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2346
+#: include/functions.inc:2389
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2389
+#: include/functions.inc:2432
 #, php-format
 msgid "The required objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2391
+#: include/functions.inc:2434
 #, php-format
 msgid "The optional objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2397
+#: include/functions.inc:2440
 #, php-format
 msgid "The required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2399
+#: include/functions.inc:2442
 #, php-format
 msgid "The optional objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2403
+#: include/functions.inc:2446
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2426
+#: include/functions.inc:2469
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2427
+#: include/functions.inc:2470
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2431
+#: include/functions.inc:2474
 msgid ""
 "You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema   configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2432
+#: include/functions.inc:2475
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2528
+#: include/functions.inc:2529
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2529
+#: include/functions.inc:2530
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2530
+#: include/functions.inc:2531
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2531
+#: include/functions.inc:2532
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2532
+#: include/functions.inc:2533
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2533
+#: include/functions.inc:2534
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2534
+#: include/functions.inc:2535
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2535
+#: include/functions.inc:2536
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2536
+#: include/functions.inc:2537
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2537
+#: include/functions.inc:2538
 msgid "Russian"
 msgstr ""
 
@@ -14801,7 +14865,7 @@ msgid ""
 "zone."
 msgstr ""
 
-#: include/functions_dns.inc:618
+#: include/functions_dns.inc:620
 #, php-format
 msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
@@ -14849,11 +14913,11 @@ msgstr ""
 msgid "XML error in %s: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:199 html/index.php:204
+#: include/class_config.inc:191 html/index.php:204
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:516
+#: include/class_config.inc:512
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -14869,86 +14933,86 @@ msgstr ""
 msgid "The timezone setting \""
 msgstr ""
 
-#: include/class_ldap.inc:199
+#: include/class_ldap.inc:207
 #, php-format
 msgid ""
 "The LDAP server is slow (%.2fs for the last query). This may be responsible "
 "for performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:233
+#: include/class_ldap.inc:241
 #, php-format
 msgid ""
 "The ldapserver is answering very slow (%.2f), this may be responsible for "
 "performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:459
+#: include/class_ldap.inc:467
 #, php-format
 msgid "Creating copy of %s"
 msgstr ""
 
-#: include/class_ldap.inc:462
+#: include/class_ldap.inc:470
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:502
+#: include/class_ldap.inc:510
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:565 include/class_ldap.inc:582
+#: include/class_ldap.inc:573 include/class_ldap.inc:590
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:742
+#: include/class_ldap.inc:750
 #, php-format
 msgid ""
 "Autocreation of subtree failed. No objectClass found for attribute '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:790 include/class_ldap.inc:880
+#: include/class_ldap.inc:799 include/class_ldap.inc:889
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:798
+#: include/class_ldap.inc:807
 #, php-format
 msgid "Creating subtree '%s' failed."
 msgstr ""
 
-#: include/class_ldap.inc:819
+#: include/class_ldap.inc:828
 #, 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:949
+#: include/class_ldap.inc:958
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:951
+#: include/class_ldap.inc:960
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1147
+#: include/class_ldap.inc:1156
 #, 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:1160
+#: include/class_ldap.inc:1169
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:1176
+#: include/class_ldap.inc:1185
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -15208,11 +15272,11 @@ msgstr ""
 msgid "The given password differ value is not numeric."
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:83 setup/class_setupStep_Config2.inc:84
+#: setup/class_setupStep_Config2.inc:81 setup/class_setupStep_Config2.inc:82
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:85
+#: setup/class_setupStep_Config2.inc:83
 msgid "Customize special parameters"
 msgstr ""
 
@@ -15445,19 +15509,19 @@ msgstr ""
 msgid "Something went wrong while copying dns."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:71 setup/class_setupStep_Config3.inc:72
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:73
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:184
+#: setup/class_setupStep_Config3.inc:186
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:188
+#: setup/class_setupStep_Config3.inc:190
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -15733,11 +15797,15 @@ msgstr ""
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:197
-msgid "Vacation templates"
+#: setup/setup_config2.tpl:199
+msgid "Account identification attribute"
 msgstr ""
 
 #: setup/setup_config2.tpl:213
+msgid "Vacation templates"
+msgstr ""
+
+#: setup/setup_config2.tpl:229
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -15762,74 +15830,82 @@ msgid "Smarty compile directory"
 msgstr ""
 
 #: setup/setup_config3.tpl:51
+msgid "SNMP community"
+msgstr ""
+
+#: setup/setup_config3.tpl:60
 msgid "Path for PPD storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:67
+#: setup/setup_config3.tpl:76
 msgid "Path for kiosk profile storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:85
+#: setup/setup_config3.tpl:94
 msgid "Enable system deployment"
 msgstr ""
 
-#: setup/setup_config3.tpl:104
+#: setup/setup_config3.tpl:113
 msgid "Network resolv hook"
 msgstr ""
 
-#: setup/setup_config3.tpl:122
+#: setup/setup_config3.tpl:131
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:140
+#: setup/setup_config3.tpl:149
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:156
+#: setup/setup_config3.tpl:165
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:159
+#: setup/setup_config3.tpl:168
+msgid "Allow login with users mail address"
+msgstr ""
+
+#: setup/setup_config3.tpl:179
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:171
+#: setup/setup_config3.tpl:191
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:183
+#: setup/setup_config3.tpl:203
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:195
+#: setup/setup_config3.tpl:215
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:203
+#: setup/setup_config3.tpl:223
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:227
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:239
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:237
+#: setup/setup_config3.tpl:257
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:249
+#: setup/setup_config3.tpl:269
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:254 setup/setup_config3.tpl:257
+#: setup/setup_config3.tpl:274 setup/setup_config3.tpl:277
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:255 setup/setup_config3.tpl:258
+#: setup/setup_config3.tpl:275 setup/setup_config3.tpl:278
 msgid "Enabled"
 msgstr ""
 
@@ -16574,15 +16650,15 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:67
+#: html/helpviewer.php:60
 msgid "Help browser"
 msgstr ""
 
-#: html/helpviewer.php:118
+#: html/helpviewer.php:111
 msgid "There is no helpfile specified for this class"
 msgstr ""
 
-#: html/helpviewer.php:265
+#: html/helpviewer.php:260
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""