Fixed Translation String.

[gosa.git] / locale / nl / LC_MESSAGES / messages.po

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index f7a6143ade951c0f098ca305c02e4618bb8b8387..e1fdcfbeb51e60adc834ce66e97a520c4e1994ca 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@
 #
 # Translator:
 # Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005.
-#: plugins/personal/generic/class_user.inc:1305
+#: plugins/personal/generic/class_user.inc:1287
 #: plugins/admin/systems/class_terminalService.inc:452
 #: plugins/admin/systems/class_terminalService.inc:453
 #: include/class_plugin.inc:115 include/class_plugin.inc:116
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-05 11:00+0200\n"
+"POT-Creation-Date: 2006-11-09 12:07+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1317
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1299
 msgid "My account"
 msgstr "Mijn account"
 
@@ -31,25 +31,25 @@ msgstr "Mijn account"
 msgid "Administration"
 msgstr "Beheer"
 
-#: contrib/gosa.conf:61
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
 msgid "Addons"
 msgstr "Plugins"
 
 #: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
-#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
-#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
-#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
+#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:113
+#: contrib/gosa.conf:118 contrib/gosa.conf:126 contrib/gosa.conf:134
+#: contrib/gosa.conf:143 contrib/gosa.conf:147 contrib/gosa.conf:169
+#: contrib/gosa.conf:173 contrib/gosa.conf:177 contrib/gosa.conf:181
 #: 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/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1294
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
 #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:880
+#: plugins/admin/groups/class_groupGeneric.inc:882
 #: plugins/admin/applications/class_applicationGeneric.inc:514
 #: plugins/admin/departments/class_departmentGeneric.inc:531
 #: plugins/admin/systems/glpiPrinter.tpl:6
@@ -65,11 +65,11 @@ msgstr "Plugins"
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:690
+#: plugins/admin/ogroups/class_ogroup.inc:705
 #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiProfile.tpl:36
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
@@ -78,7 +78,7 @@ msgstr "Plugins"
 #: plugins/admin/mimetypes/generic.tpl:4
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:465
+#: plugins/gofon/macro/class_gofonMacro.inc:474
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Algemeen"
@@ -89,18 +89,18 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/personal/environment/class_environment.inc:1240
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:189
 msgid "Environment"
 msgstr "Omgeving"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/personal/mail/class_mailAccount.inc:998
-#: plugins/admin/groups/class_groupMail.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/admin/groups/class_groupMail.inc:1054
 #: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:191
 #: plugins/admin/ogroups/tabs_ogroups.inc:76
 #: plugins/admin/ogroups/tabs_ogroups.inc:184
 #: plugins/admin/ogroups/class_mailogroup.inc:163
@@ -112,7 +112,7 @@ msgstr "E-mail"
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/personal/samba/class_sambaAccount.inc:1033
 #: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:197
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -120,7 +120,7 @@ msgstr "Samba"
 
 #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
 #: plugins/personal/netatalk/class_netatalk.inc:342
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:199
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -131,31 +131,31 @@ msgstr "Verbindingen"
 
 #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
 #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
 #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:805
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:811
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:191
+#: plugins/admin/users/class_divListUsers.inc:195
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:550
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:94
+#: plugins/addons/addressbook/address_edit.tpl:221
+#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:163
 #: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:193
 #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:804
+#: plugins/admin/systems/class_systemManagement.inc:818
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/ogroups/class_phonequeue.inc:718
@@ -170,54 +170,50 @@ msgstr "Telefoon"
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1102
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1163
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:112
 #: plugins/admin/mimetypes/generic.tpl:165
 msgid "Applications"
 msgstr "Programma's"
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:307
-msgid "ACL"
-msgstr "Rechten"
-
-#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:240
 #: plugins/admin/ogroups/phonequeue.tpl:43
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/gofon/conference/generic.tpl:121
 msgid "Options"
 msgstr "Opties"
 
-#: contrib/gosa.conf:115
+#: contrib/gosa.conf:114
 #: plugins/admin/applications/class_applicationParameters.inc:230
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:664
 msgid "Parameter"
 msgstr "Parameters"
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
 #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1100
+#: plugins/admin/systems/class_workstationStartup.inc:1109
 #: plugins/admin/ogroups/tabs_ogroups.inc:99
 msgid "Startup"
 msgstr "Opstarten"
 
-#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: contrib/gosa.conf:120 contrib/gosa.conf:136
 #: plugins/admin/ogroups/tabs_ogroups.inc:103
 msgid "Devices"
 msgstr "Apparaten"
 
-#: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:228
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/personal/environment/environment.tpl:235
+#: plugins/admin/systems/class_systemManagement.inc:827
 #: plugins/admin/systems/class_printGeneric.inc:860
 #: plugins/admin/ogroups/class_ogroupManagement.inc:386
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Printer"
 
-#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
-#: plugins/gofax/blocklists/generic.tpl:75
+#: contrib/gosa.conf:122 contrib/gosa.conf:130 contrib/gosa.conf:138
+#: plugins/gofax/blocklists/generic.tpl:90
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:127
@@ -235,7 +231,7 @@ msgstr "Printer"
 msgid "Information"
 msgstr "Informatie"
 
-#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:39
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
 #: plugins/admin/systems/class_servDNS.inc:383
 #: plugins/admin/systems/class_goFaxServer.inc:85
 #: plugins/admin/systems/class_servKolab.inc:375
@@ -251,22 +247,22 @@ msgstr "Informatie"
 #: plugins/admin/systems/class_goKrbServer.inc:88
 #: plugins/admin/systems/class_goMailServer.inc:686
 #: plugins/admin/systems/class_goImapServer.inc:155
+#: plugins/admin/systems/class_goShareServer.inc:344
 #: plugins/admin/systems/class_goVirusServer.inc:212
 #: plugins/admin/systems/class_goSpamServer.inc:320
-#: plugins/admin/systems/class_goShareServer.inc:344
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:140
+#: contrib/gosa.conf:129 contrib/gosa.conf:139
 #: plugins/admin/fai/class_faiSummaryTab.inc:546
 msgid "FAI summary"
 msgstr "FAI samenvatting"
 
-#: contrib/gosa.conf:193
+#: contrib/gosa.conf:192
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:203 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -275,11 +271,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exporteer"
 
-#: contrib/gosa.conf:205
+#: contrib/gosa.conf:204
 msgid "Excel Export"
 msgstr "Excel Export"
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
+#: contrib/gosa.conf:205 plugins/personal/mail/generic.tpl:141
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -289,50 +285,50 @@ msgstr "Excel Export"
 msgid "Import"
 msgstr "Importeren"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:206
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:211
+#: contrib/gosa.conf:210
 msgid "Partitions"
 msgstr "Partities"
 
-#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:507
+#: plugins/admin/fai/class_faiScript.inc:518
 #: plugins/admin/fai/faiScriptEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Variables"
 msgstr "Variabelen"
 
-#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
+#: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
 #: plugins/admin/fai/class_faiSummaryTab.inc:47
 msgid "Profiles"
 msgstr "Profielen"
 
-#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
 #: plugins/admin/acl/class_divListACL.inc:49
 #: plugins/admin/fai/class_faiSummaryTab.inc:545
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:557
+#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:538
 msgid "Packages"
 msgstr "Pakketten"
 
-#: contrib/gosa.conf:258
+#: contrib/gosa.conf:257
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
@@ -379,7 +375,7 @@ msgstr "Selecteer de toe te voegen adressen"
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/addressbook/contents.tpl:62
 #: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
@@ -406,11 +402,11 @@ msgstr "Filters"
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/addons/addressbook/contents.tpl:84
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Choose the department the search will be based on"
 msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
 
@@ -432,7 +428,7 @@ msgid "User name of which addresses are shown"
 msgstr "Gebruikersnaam van wie de adressen getoond worden"
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:160
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:88
@@ -444,20 +440,20 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:53
 #: plugins/personal/connectivity/class_kolabAccount.inc:255
-#: plugins/personal/environment/environment.tpl:150
-#: plugins/personal/environment/environment.tpl:174
-#: plugins/personal/environment/environment.tpl:241
+#: plugins/personal/environment/environment.tpl:157
+#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:248
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:68
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/generic.tpl:105
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:71
 #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/generic.tpl:137
 #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:573
+#: plugins/admin/groups/class_groupMail.inc:588
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
@@ -480,8 +476,8 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:473
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/class_termDNS.inc:472
+#: plugins/admin/systems/class_termDNS.inc:492
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
@@ -495,14 +491,16 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/admin/systems/goSpamServer.tpl:45
 #: plugins/admin/systems/goSpamServer.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:28 plugins/admin/ogroups/generic.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:33
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/fai/faiHook.tpl:50
-#: plugins/admin/mimetypes/generic.tpl:108
+#: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
+#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPartitionTable.tpl:48
+#: plugins/admin/fai/faiPartitionTable.tpl:50
+#: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
+#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:40
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:48
+#: plugins/admin/fai/faiHook.tpl:50 plugins/admin/mimetypes/generic.tpl:108
 #: plugins/admin/mimetypes/generic.tpl:120
 #: plugins/admin/mimetypes/generic.tpl:174
 #: plugins/gofon/phoneaccount/generic.tpl:19
@@ -510,43 +508,43 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:97
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:97
+#: plugins/personal/posix/main.inc:107 plugins/personal/samba/main.inc:105
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:151
+#: plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:103
-#: plugins/personal/environment/main.inc:97
+#: plugins/personal/environment/main.inc:103
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:54
-#: plugins/personal/nagios/main.inc:97 plugins/personal/netatalk/main.inc:97
-#: plugins/gofax/blocklists/generic.tpl:91
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:97
+#: plugins/gofax/blocklists/generic.tpl:106
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:83
+#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:95
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/addressbook/address_edit.tpl:265
 #: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:332
+#: plugins/admin/groups/class_groupManagement.inc:335
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:352
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:492
+#: plugins/admin/systems/class_systemManagement.inc:506
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30
@@ -588,18 +586,18 @@ msgstr "Toevoegen"
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/goVirusServer.tpl:171
 #: plugins/admin/systems/class_goService.inc:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:334
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:617
-#: plugins/admin/fai/class_faiManagement.inc:622
-#: plugins/admin/fai/class_faiManagement.inc:628
+#: plugins/admin/fai/class_faiManagement.inc:619
+#: plugins/admin/fai/class_faiManagement.inc:624
+#: plugins/admin/fai/class_faiManagement.inc:630
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:83
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:40
+#: plugins/admin/fai/faiVariableEntry.tpl:55
 #: plugins/admin/fai/faiHookEntry.tpl:85
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiTemplateEntry.tpl:171
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:51
@@ -607,15 +605,15 @@ msgstr "Toevoegen"
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
 #: plugins/admin/mimetypes/remove.tpl:15
-#: plugins/gofon/phoneaccount/main.inc:98
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
+#: plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
 #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
-#: ihtml/themes/default/snapshotdialog.tpl:39
-#: ihtml/themes/default/snapshotdialog.tpl:82
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:38
+#: ihtml/themes/default/snapshotdialog.tpl:80
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -628,7 +626,7 @@ msgstr "Primair adres"
 #: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
 #: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:805
+#: plugins/admin/systems/class_systemManagement.inc:819
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
@@ -651,9 +649,9 @@ msgid "not defined"
 msgstr "niet gedefiniëerd"
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1010
+#: plugins/personal/mail/class_mailAccount.inc:1009
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1039
+#: plugins/admin/groups/class_groupMail.inc:1065
 msgid "Quota size"
 msgstr "Quota grootte"
 
@@ -669,7 +667,7 @@ msgstr "Alternatieve adressen"
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
 
-#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:166
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:91
@@ -677,11 +675,11 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:410
 #: plugins/personal/connectivity/kolab.tpl:56
-#: plugins/personal/environment/environment.tpl:180
-#: plugins/personal/environment/environment.tpl:218
-#: plugins/personal/environment/environment.tpl:244
-#: plugins/personal/environment/class_environment.inc:658
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/personal/environment/environment.tpl:187
+#: plugins/personal/environment/environment.tpl:225
+#: plugins/personal/environment/environment.tpl:251
+#: plugins/personal/environment/class_environment.inc:685
+#: plugins/gofax/blocklists/generic.tpl:83
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:111
 #: plugins/gofax/faxaccount/lists.tpl:14
@@ -707,15 +705,16 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:487
+#: plugins/admin/systems/class_termDNS.inc:486
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
 #: plugins/admin/systems/goShareServer.tpl:20
 #: plugins/admin/ogroups/termgroup.tpl:33 plugins/admin/ogroups/generic.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:36 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:55
+#: plugins/admin/fai/faiVariable.tpl:57 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:54
 #: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/mimetypes/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:22
@@ -729,136 +728,136 @@ msgstr "Verwijderen"
 msgid "Mail options"
 msgstr "E-mail opties"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 "Selecteer indien u E-mail door wil sturen zonder zelf kopieën te ontvangen"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "No delivery to own mailbox"
 msgstr "Geen aflevering in eigen mailbox"
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Selecteer om automatisch te reageren met het onderstaande afwezigheidsbericht"
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid "Activate vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: plugins/personal/mail/generic.tpl:99
+#: plugins/personal/mail/generic.tpl:97
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Selecteer indien u E-mail berichten wilt filteren m.b.v. spamassassin"
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:99
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verplaats E-mails met spam nivo groter dan"
 
-#: plugins/personal/mail/generic.tpl:104
+#: plugins/personal/mail/generic.tpl:102
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Selecteer een spam nivo - kleinere waardes zijn gevoeliger"
 
-#: plugins/personal/mail/generic.tpl:108
+#: plugins/personal/mail/generic.tpl:106
 msgid "to folder"
 msgstr "naar map"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:117
 msgid "Reject mails bigger than"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/mail/generic.tpl:119
 #: plugins/personal/connectivity/pureftpd.tpl:60
 #: plugins/personal/connectivity/class_proxyAccount.inc:91
-#: plugins/personal/environment/environment.tpl:55
+#: plugins/personal/environment/environment.tpl:62
 #: plugins/admin/groups/mail.tpl:48
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:129
-#: plugins/personal/mail/class_mailAccount.inc:1013
+#: plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/class_mailAccount.inc:1012
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:147
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "Stuur berichten door naar"
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:163
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:108 plugins/admin/groups/mail.tpl:138
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Lokaal toevoegen"
 
-#: plugins/personal/mail/generic.tpl:178
+#: plugins/personal/mail/generic.tpl:174
 msgid "Advanced mail options"
 msgstr "Geavanceerde E-mail opties"
 
-#: plugins/personal/mail/generic.tpl:184
+#: plugins/personal/mail/generic.tpl:180
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en "
 "versturen"
 
-#: plugins/personal/mail/generic.tpl:186
+#: plugins/personal/mail/generic.tpl:182
 msgid "User is only allowed to send and receive local mails"
 msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
 
-#: plugins/personal/mail/generic.tpl:195
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/generic.tpl:190
+#: plugins/personal/mail/class_mailAccount.inc:1027
 msgid "Use custom sieve script"
 msgstr "Gebruik een eigen sieve script"
 
-#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/generic.tpl:190
 msgid "disables all Mail options!"
 msgstr "schakelt alle E-mail opties uit!"
 
-#: plugins/personal/mail/main.inc:95 plugins/personal/posix/main.inc:100
-#: plugins/personal/samba/main.inc:95 plugins/personal/generic/main.inc:149
+#: plugins/personal/mail/main.inc:103 plugins/personal/posix/main.inc:105
+#: plugins/personal/samba/main.inc:103 plugins/personal/generic/main.inc:156
 #: plugins/personal/connectivity/main.inc:101
-#: plugins/personal/environment/main.inc:95
-#: plugins/personal/nagios/main.inc:95 plugins/personal/netatalk/main.inc:95
-#: plugins/gofax/blocklists/generic.tpl:85
-#: plugins/gofax/faxaccount/main.inc:81
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/personal/environment/main.inc:101
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:95
+#: plugins/gofax/blocklists/generic.tpl:100
+#: plugins/gofax/faxaccount/main.inc:93
+#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/users/class_userManagement.inc:646
 #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:500
 #: plugins/admin/ogroups/class_ogroupManagement.inc:328
-#: plugins/admin/fai/class_faiManagement.inc:611
+#: plugins/admin/fai/class_faiManagement.inc:613
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
-#: plugins/gofon/phoneaccount/main.inc:96
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
 msgid "Ok"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:105 plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/main.inc:107 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:113 plugins/personal/posix/main.inc:117
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:111
-#: plugins/personal/environment/main.inc:105
-#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:102
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/personal/environment/main.inc:111
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:102
+#: plugins/gofax/faxaccount/main.inc:101
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
 "veranderen"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/posix/main.inc:114
-#: plugins/personal/samba/main.inc:108 plugins/personal/generic/main.inc:162
+#: plugins/personal/mail/main.inc:116 plugins/personal/posix/main.inc:119
+#: plugins/personal/samba/main.inc:116 plugins/personal/generic/main.inc:169
 #: plugins/personal/connectivity/main.inc:112
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/main.inc:106
-#: plugins/personal/nagios/main.inc:107 plugins/personal/netatalk/main.inc:103
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/main.inc:112
+#: plugins/personal/nagios/main.inc:116 plugins/personal/netatalk/main.inc:103
 #: plugins/gofax/faxaccount/generic.tpl:121
 #: plugins/gofax/faxaccount/generic.tpl:129
-#: plugins/gofax/faxaccount/main.inc:90 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/printer.tpl:68
+#: plugins/gofax/faxaccount/main.inc:102
+#: plugins/addons/logview/contents.tpl:62 plugins/admin/systems/printer.tpl:68
 #: plugins/admin/systems/glpiPrinter.tpl:88
 #: plugins/admin/systems/glpiPrinter.tpl:99
 #: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/glpi.tpl:61
@@ -868,18 +867,18 @@ msgstr ""
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/goShareServer.tpl:17
-#: plugins/admin/fai/faiVariable.tpl:45
-#: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/admin/fai/faiVariable.tpl:53
+#: plugins/admin/fai/faiPartitionTable.tpl:53
+#: plugins/gofon/phoneaccount/main.inc:114
 msgid "Edit"
 msgstr "Bewerken"
 
-#: plugins/personal/mail/main.inc:114
+#: plugins/personal/mail/main.inc:125
 msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:998
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "E-mail instellingen"
@@ -929,7 +928,7 @@ msgid "This does something"
 msgstr "Dit doet iets"
 
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:75
+#: plugins/admin/groups/class_groupMail.inc:76
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "De E-mail methode '%s' opgegeven in uw gosa.conf is niet beschikbaar."
@@ -944,7 +943,7 @@ msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
 
 #: plugins/personal/mail/class_mailAccount.inc:262
 #: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:332
+#: plugins/admin/groups/class_groupMail.inc:335
 #: plugins/admin/ogroups/class_mailogroup.inc:44
 msgid "Remove mail account"
 msgstr "E-mail account verwijderen"
@@ -956,7 +955,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:336
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -965,13 +964,13 @@ msgstr ""
 "uitschakelen door de knop hieronder te gebruiken."
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:335
+#: plugins/admin/groups/class_groupMail.inc:338
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Create mail account"
 msgstr "E-mail account aanmaken"
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:339
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -986,7 +985,7 @@ msgstr ""
 "U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
 
 #: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:400
+#: plugins/admin/groups/class_groupMail.inc:415
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Het toevoegen van een van uw eigen adressen aan de lijst met doorstuur "
@@ -994,7 +993,7 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:357
 #: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/admin/groups/class_groupMail.inc:426
+#: plugins/admin/groups/class_groupMail.inc:441
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -1003,85 +1002,85 @@ msgstr ""
 "alternatieve adressen."
 
 #: plugins/personal/mail/class_mailAccount.inc:372
-#: plugins/admin/groups/class_groupMail.inc:431
+#: plugins/admin/groups/class_groupMail.inc:446
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
-#: plugins/personal/mail/class_mailAccount.inc:597
+#: plugins/personal/mail/class_mailAccount.inc:596
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Het verwijderen van het E-mail account is mislukt"
 
-#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/personal/mail/class_mailAccount.inc:724
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Het opslaan van het E-mail account is mislukt"
 
-#: plugins/personal/mail/class_mailAccount.inc:777
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Er is geen geldige mailserver gespecificeerd. Voeg er a.u.b. een toe in de "
 "systeem instellingen."
 
-#: plugins/personal/mail/class_mailAccount.inc:782
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:781
+#: plugins/admin/groups/class_groupMail.inc:877
 msgid "The required field 'Primary address' is not set."
 msgstr "Het vereiste veld 'Primair adres' is leeg."
 
-#: plugins/personal/mail/class_mailAccount.inc:786
-#: plugins/personal/mail/class_mailAccount.inc:790
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/addons/addressbook/class_addressbook.inc:694
 #: plugins/admin/ogroups/class_mailogroup.inc:79
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
 
-#: plugins/personal/mail/class_mailAccount.inc:796
-#: plugins/admin/groups/class_groupMail.inc:860
+#: plugins/personal/mail/class_mailAccount.inc:795
+#: plugins/admin/groups/class_groupMail.inc:886
 #: plugins/admin/ogroups/class_mailogroup.inc:86
 msgid "The primary address you've entered is already in use."
 msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
 
-#: plugins/personal/mail/class_mailAccount.inc:802
-#: plugins/admin/groups/class_groupMail.inc:866
+#: plugins/personal/mail/class_mailAccount.inc:801
+#: plugins/admin/groups/class_groupMail.inc:892
 msgid "Value in 'Quota size' is not valid."
 msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
 
-#: plugins/personal/mail/class_mailAccount.inc:811
-#: plugins/admin/groups/class_groupMail.inc:875
+#: plugins/personal/mail/class_mailAccount.inc:810
+#: plugins/admin/groups/class_groupMail.inc:901
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
 
-#: plugins/personal/mail/class_mailAccount.inc:821
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/personal/mail/class_mailAccount.inc:820
+#: plugins/admin/groups/class_groupMail.inc:909
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
 "afwijzen."
 
-#: plugins/personal/mail/class_mailAccount.inc:825
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
 
-#: plugins/personal/mail/class_mailAccount.inc:865
-#: plugins/personal/mail/class_mailAccount.inc:877
+#: plugins/personal/mail/class_mailAccount.inc:864
+#: plugins/personal/mail/class_mailAccount.inc:876
 #, fuzzy
 msgid "You are not allowed to write mail forwarding."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: plugins/personal/mail/class_mailAccount.inc:909
-#: plugins/personal/mail/class_mailAccount.inc:920
+#: plugins/personal/mail/class_mailAccount.inc:908
+#: plugins/personal/mail/class_mailAccount.inc:919
 #, fuzzy
 msgid "You are not allowed to write mail alternate address."
 msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:984
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 "Bezig met wachten op het verwijderen van alle mail eigenschappen door Kolab"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:986
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1089,77 +1088,72 @@ msgstr ""
 "Verwijder a.u.b. eerst het mail account, zodat kolab haar verwijder "
 "procedure kan starten."
 
-#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/personal/mail/class_mailAccount.inc:1007
 #: plugins/personal/nagios/nagios.tpl:17
 #: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/admin/groups/class_groupMail.inc:1036
+#: plugins/addons/addressbook/class_addressbook.inc:797
+#: plugins/admin/groups/class_groupMail.inc:1062
 #: plugins/admin/systems/class_servDNS.inc:394
 #: plugins/admin/systems/servdnseditzone.tpl:51
-#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:174
+#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:225
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: plugins/personal/mail/class_mailAccount.inc:1009
-#: plugins/admin/groups/class_groupMail.inc:1040
+#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/admin/groups/class_groupMail.inc:1066
 msgid "Mail server"
 msgstr "Mail server"
 
-#: plugins/personal/mail/class_mailAccount.inc:1012
+#: plugins/personal/mail/class_mailAccount.inc:1011
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/mail/class_mailAccount.inc:1015
+#: plugins/personal/mail/class_mailAccount.inc:1014
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1015
 #, fuzzy
 msgid "Spam level"
 msgstr "Log prioriteit"
 
-#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/personal/mail/class_mailAccount.inc:1016
 #, fuzzy
 msgid "Spam mail box"
 msgstr "E-mail grootte"
 
-#: plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/mail/class_mailAccount.inc:1018
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1019
 #, fuzzy
 msgid "Mail max size"
 msgstr "E-mail grootte"
 
-#: plugins/personal/mail/class_mailAccount.inc:1022
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1026
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Primair adres"
 
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1022
 #, fuzzy
 msgid "Local delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1023
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1024
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Alternatieve adressen"
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:255
-msgid "Change password"
-msgstr "Verander wachtwoord"
-
-#: plugins/personal/password/password.tpl:6
+#: plugins/personal/password/password.tpl:3
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
@@ -1169,12 +1163,12 @@ msgstr ""
 "veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
 "b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
 
-#: plugins/personal/password/password.tpl:11
-#: plugins/personal/password/main.inc:73
+#: plugins/personal/password/password.tpl:8
+#: plugins/personal/password/main.inc:74
 msgid "You have no permissions to change your password."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/personal/password/password.tpl:13
+#: plugins/personal/password/password.tpl:10
 #: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
@@ -1183,33 +1177,33 @@ msgstr ""
 "Het veranderen van het wachtwoord is van invloed op E-mail, proxy, samba en "
 "Unix diensten."
 
-#: plugins/personal/password/password.tpl:19
+#: plugins/personal/password/password.tpl:16
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:24
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: plugins/personal/password/password.tpl:35
+#: plugins/personal/password/password.tpl:32
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Herhaal het nieuwe wachtwoord"
 
-#: plugins/personal/password/password.tpl:48
+#: plugins/personal/password/password.tpl:45
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Wachtwoord instellen"
 
-#: plugins/personal/password/password.tpl:52
+#: plugins/personal/password/password.tpl:49
 msgid "Clear fields"
 msgstr "Wis velden"
 
-#: plugins/personal/password/changed.tpl:6
+#: plugins/personal/password/changed.tpl:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
@@ -1217,8 +1211,8 @@ msgstr ""
 "U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle "
 "programma's die dit wachtwoord gebruiken ook aanpast!"
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:159
+#: plugins/personal/password/changed.tpl:8
+#: plugins/personal/generic/main.inc:166
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
@@ -1226,7 +1220,7 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/mailqueue/header.tpl:5
 #: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1531
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1445
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1236,13 +1230,13 @@ msgid "Back"
 msgstr "Terug"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:32
+#: plugins/personal/generic/paste_generic.tpl:20
 #: plugins/admin/systems/class_goFaxServer.inc:94
 #: plugins/admin/systems/goKrbServer.tpl:20
 #: plugins/admin/systems/goFonServer.tpl:12
 #: plugins/admin/systems/class_goGlpiServer.inc:98
 #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 #: plugins/admin/systems/goImapServer.tpl:34
 #: plugins/admin/systems/class_goFonServer.inc:107
 #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1255,7 +1249,7 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1305
 #, fuzzy
 msgid "User password"
 msgstr "Wachtwoord wissen"
@@ -1268,7 +1262,7 @@ msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 msgid "You are not allowed to change your password at this time"
 msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
 
-#: plugins/personal/password/main.inc:44
+#: plugins/personal/password/main.inc:45
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -1276,12 +1270,12 @@ msgstr ""
 "Het wachtwoord dat u opgegeven heeft als uw huidige wachtwoord is niet "
 "correct."
 
-#: plugins/personal/password/main.inc:47
+#: plugins/personal/password/main.inc:48
 msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
-#: plugins/personal/password/main.inc:52 plugins/personal/generic/main.inc:76
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/personal/password/main.inc:53 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:218
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1289,26 +1283,31 @@ msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen."
 
-#: plugins/personal/password/main.inc:55 plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:224
+#: plugins/personal/password/main.inc:56 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:223
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
-#: plugins/personal/password/main.inc:63
+#: plugins/personal/password/main.inc:64
 msgid "The password used as new and current are too similar."
 msgstr ""
 "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: plugins/personal/password/main.inc:68
+#: plugins/personal/password/main.inc:69
 msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: plugins/personal/password/main.inc:91
+#: plugins/personal/password/main.inc:94
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
+#: plugins/personal/password/main.inc:123
+#: plugins/admin/users/class_divListUsers.inc:261
+msgid "Change password"
+msgstr "Verander wachtwoord"
+
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1281
+#: plugins/personal/posix/class_posixAccount.inc:1289
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
 #: plugins/personal/samba/class_sambaAccount.inc:637
@@ -1316,7 +1315,7 @@ msgid "Home directory"
 msgstr "Persoonlijke map"
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1282
+#: plugins/personal/posix/class_posixAccount.inc:1290
 msgid "Shell"
 msgstr "Shell"
 
@@ -1328,6 +1327,7 @@ msgstr "Primaire groep"
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:234
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/class_faxreport.inc:482
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
 #: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
@@ -1339,13 +1339,13 @@ msgid "Force UID/GID"
 msgstr "Forceer UID/GID"
 
 #: plugins/personal/posix/generic.tpl:51
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:287
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:896
+#: plugins/admin/groups/class_groupGeneric.inc:898
 msgid "GID"
 msgstr "GID"
 
@@ -1386,6 +1386,7 @@ msgstr "Toon groepen van afdeling"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
 #: plugins/admin/acl/class_divListACL.inc:57
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
@@ -1435,7 +1436,7 @@ msgstr "Toon systemen van afdeling"
 msgid "Display systems matching"
 msgstr "Toon de overeenkomende systemen"
 
-#: plugins/personal/posix/main.inc:123
+#: plugins/personal/posix/main.inc:128
 msgid "Unix settings"
 msgstr "Unix instellingen"
 
@@ -1465,32 +1466,32 @@ msgid "active"
 msgstr "actief"
 
 #: plugins/personal/posix/class_posixAccount.inc:155
-#: plugins/personal/posix/class_posixAccount.inc:1009
+#: plugins/personal/posix/class_posixAccount.inc:1002
 msgid "Group of user"
 msgstr "Gebruikersgroep"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
+#: plugins/personal/posix/class_posixAccount.inc:190
 msgid "unconfigured"
 msgstr "niet geconfigureerd"
 
-#: plugins/personal/posix/class_posixAccount.inc:212
+#: plugins/personal/posix/class_posixAccount.inc:207
 #: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:784
+#: plugins/admin/systems/class_workstationStartup.inc:791
 #: plugins/admin/systems/class_workstationService.inc:182
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:220
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:258
+#: plugins/personal/posix/class_posixAccount.inc:253
 msgid "This account has no unix extensions."
 msgstr "Dit account heeft geen Unix mogelijkheden."
 
-#: plugins/personal/posix/class_posixAccount.inc:278
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:273
+#: plugins/personal/posix/class_posixAccount.inc:276
 msgid "Remove posix account"
 msgstr "Verwijder POSIX account"
 
-#: plugins/personal/posix/class_posixAccount.inc:279
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1498,7 +1499,7 @@ msgstr ""
 "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
 "moet u eerst het samba / omgevings account verwijderen."
 
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1506,11 +1507,11 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden ingeschakeld. U kunt deze uitschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/personal/posix/class_posixAccount.inc:285
+#: plugins/personal/posix/class_posixAccount.inc:280
 msgid "Create posix account"
 msgstr "POSIX account aanmaken"
 
-#: plugins/personal/posix/class_posixAccount.inc:286
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1518,30 +1519,30 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Het wachtwoord kan pas %s dag(en) na de laatste wijziging gewijzigd worden"
 
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:445
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Het wachtwoord moet na %s dag(en) gewijzigd worden"
 
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:449
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Blokkeer het account na %s dag(en) inactiviteit nadat het wachtwoord "
 "verlopen is"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:453
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1550,7 +1551,7 @@ msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 msgid "January"
 msgstr "Januari"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1559,7 +1560,7 @@ msgstr "Januari"
 msgid "February"
 msgstr "Februari"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1568,7 +1569,7 @@ msgstr "Februari"
 msgid "March"
 msgstr "Maart"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1577,7 +1578,7 @@ msgstr "Maart"
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1586,7 +1587,7 @@ msgstr "April"
 msgid "May"
 msgstr "Mei"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1595,7 +1596,7 @@ msgstr "Mei"
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1604,7 +1605,7 @@ msgstr "Juni"
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1613,7 +1614,7 @@ msgstr "Juli"
 msgid "August"
 msgstr "Augustus"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1622,7 +1623,7 @@ msgstr "Augustus"
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1631,7 +1632,7 @@ msgstr "September"
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1640,7 +1641,7 @@ msgstr "Oktober"
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1649,154 +1650,154 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 #: plugins/personal/samba/class_sambaAccount.inc:468
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 msgid "full access"
 msgstr "volledige toegang"
 
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:568
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: plugins/personal/posix/class_posixAccount.inc:621
+#: plugins/personal/posix/class_posixAccount.inc:614
 #, fuzzy, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
 msgstr "Het verwijderen van het proxy account is mislukt"
 
-#: plugins/personal/posix/class_posixAccount.inc:769
+#: plugins/personal/posix/class_posixAccount.inc:762
 msgid "Failed: overriding lock"
 msgstr "Mislukt: Blokkering wordt overschreven"
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:851
 #, fuzzy, php-format
 msgid "Saving of user/posix account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "The required field 'Home directory' is not set."
 msgstr "Het vereiste veld 'Persoonlijke map' is leeg."
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr "Geef a.u.b. een geldige map op in het 'Persoonlijke map' veld."
 
-#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'UID' is not valid."
 msgstr "De opgegeven 'UID' waarde is niet correct."
 
-#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'UID' is too small."
 msgstr "De opgegeven 'UID' waarde is te klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:941
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:795
 msgid "Value specified as 'GID' is not valid."
 msgstr "De opgegeven 'GID' waarde is niet geldig."
 
-#: plugins/personal/posix/class_posixAccount.inc:944
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:798
 msgid "Value specified as 'GID' is too small."
 msgstr "De opgegeven 'GID' waarde is te klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:945
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "De opgegeven 'shadowMin' waarde is niet geldig."
 
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:950
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "De opgegeven 'shadowMax' waarde is niet geldig."
 
-#: plugins/personal/posix/class_posixAccount.inc:962
+#: plugins/personal/posix/class_posixAccount.inc:955
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "De opgegeven 'shadowWarning' waarde is niet geldig."
 
-#: plugins/personal/posix/class_posixAccount.inc:965
+#: plugins/personal/posix/class_posixAccount.inc:958
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' zonder 'shadowMax' is niet logisch."
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "De waarde opgegeven voor 'shadowWarning' moet kleiner zijn dan 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:971
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "De waarde opgegeven voor 'shadowWarning' moet groter dan 'shadowMin' zijn."
 
-#: plugins/personal/posix/class_posixAccount.inc:976
+#: plugins/personal/posix/class_posixAccount.inc:969
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "De waarde opgegeven voor 'shadowInactive' is niet geldig."
 
-#: plugins/personal/posix/class_posixAccount.inc:979
+#: plugins/personal/posix/class_posixAccount.inc:972
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' zonder 'shadowMax' is niet logisch."
 
-#: plugins/personal/posix/class_posixAccount.inc:984
+#: plugins/personal/posix/class_posixAccount.inc:977
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "De waarde opgegeven voor 'shadowMin' moet kleiner zijn dan 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:834
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1271
+#: plugins/personal/posix/class_posixAccount.inc:1279
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1283
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
+#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
+#: html/getxls.php:364
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1284
+#: plugins/personal/posix/class_posixAccount.inc:1292
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1286
+#: plugins/personal/posix/class_posixAccount.inc:1294
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/posix/class_posixAccount.inc:1287
+#: plugins/personal/posix/class_posixAccount.inc:1295
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1288
+#: plugins/personal/posix/class_posixAccount.inc:1296
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1289
+#: plugins/personal/posix/class_posixAccount.inc:1297
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1290
+#: plugins/personal/posix/class_posixAccount.inc:1298
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/personal/posix/class_posixAccount.inc:1299
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1292
+#: plugins/personal/posix/class_posixAccount.inc:1300
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -1938,7 +1939,7 @@ msgstr "Het account verloopt op"
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
-#: plugins/personal/samba/main.inc:116
+#: plugins/personal/samba/main.inc:124
 #: plugins/personal/samba/class_sambaAccount.inc:1034
 msgid "Samba settings"
 msgstr "Samba Instellingen"
@@ -2143,68 +2144,69 @@ msgstr "ongeldig"
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:560
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:630
+#: plugins/personal/generic/class_user.inc:628
 #: plugins/admin/systems/class_printGeneric.inc:625
 #, fuzzy, php-format
 msgid "You are not allowed to move this object to '%s'."
 msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
 
-#: plugins/personal/generic/class_user.inc:877
+#: plugins/personal/generic/class_user.inc:876
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:924
+#: plugins/personal/generic/class_user.inc:923
 msgid "Kerberos database communication failed"
 msgstr "Kerberos database communicatie is mislukt"
 
-#: plugins/personal/generic/class_user.inc:941
+#: plugins/personal/generic/class_user.inc:940
 msgid "Can't remove user from kerberos database."
 msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:952
+#: plugins/personal/generic/class_user.inc:951
 msgid "Can't add user to kerberos database."
 msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:993
+#: plugins/personal/generic/class_user.inc:992
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
 
-#: plugins/personal/generic/class_user.inc:996
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/generic/class_user.inc:995
+#, fuzzy
+msgid "You have no permissions to move this user to the spicified 'Base'."
 msgstr ""
 "U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
 "'Basis'."
 
-#: plugins/personal/generic/class_user.inc:1002
-#: plugins/addons/addressbook/class_addressbook.inc:553
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/personal/generic/class_user.inc:1001
+#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/admin/users/class_userManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:544
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
-#: plugins/personal/generic/class_user.inc:1017
-#: plugins/addons/addressbook/class_addressbook.inc:557
-#: plugins/admin/users/class_userManagement.inc:473
-#: plugins/admin/users/class_userManagement.inc:551
+#: plugins/personal/generic/class_user.inc:1016
+#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/admin/users/class_userManagement.inc:469
+#: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 msgid "The required field 'Login' is not set."
 msgstr "Het vereiste veld 'Inlog naam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:1027
+#: plugins/personal/generic/class_user.inc:1026
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2212,7 +2214,7 @@ msgstr ""
 "Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
 "de database."
 
-#: plugins/personal/generic/class_user.inc:1034
+#: plugins/personal/generic/class_user.inc:1033
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2220,149 +2222,149 @@ msgstr ""
 "Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
 "liggende streepjes zijn toegestaan."
 
-#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1036
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Het veld 'Website' bevat een ongeldige URL."
 
-#: plugins/personal/generic/class_user.inc:1040
-#: plugins/personal/generic/class_user.inc:1065
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:591
+#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1064
+#: plugins/addons/addressbook/class_addressbook.inc:661
+#: plugins/addons/addressbook/class_addressbook.inc:689
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Name' contains invalid characters."
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: plugins/personal/generic/class_user.inc:1043
-#: plugins/personal/generic/class_user.inc:1062
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/personal/generic/class_user.inc:1042
+#: plugins/personal/generic/class_user.inc:1061
+#: plugins/addons/addressbook/class_addressbook.inc:664
+#: plugins/addons/addressbook/class_addressbook.inc:686
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
 
-#: plugins/personal/generic/class_user.inc:1048
-#: plugins/addons/addressbook/class_addressbook.inc:571
-#: plugins/addons/addressbook/class_addressbook.inc:574
+#: plugins/personal/generic/class_user.inc:1047
+#: plugins/addons/addressbook/class_addressbook.inc:669
+#: plugins/addons/addressbook/class_addressbook.inc:672
 #: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
 
-#: plugins/personal/generic/class_user.inc:1051
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/personal/generic/class_user.inc:1050
+#: plugins/addons/addressbook/class_addressbook.inc:675
 #: plugins/admin/departments/class_departmentGeneric.inc:255
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
 
-#: plugins/personal/generic/class_user.inc:1054
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1053
+#: plugins/addons/addressbook/class_addressbook.inc:678
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1057
-#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/personal/generic/class_user.inc:1056
+#: plugins/addons/addressbook/class_addressbook.inc:681
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
 
-#: plugins/personal/generic/class_user.inc:1185
+#: plugins/personal/generic/class_user.inc:1165
 msgid "Could not open specified certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1279
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1280
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1281
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1300
+#: plugins/personal/generic/class_user.inc:1282
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/class_user.inc:1283
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1284
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1285
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1286
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1288
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1289
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1290
 #: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Funktie"
 
-#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1291
 #: plugins/personal/generic/generic.tpl:459
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:179
+#: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1295
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:91
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: include/class_acl.inc:164 html/getxls.php:89 html/getxls.php:90
+#: html/getxls.php:308
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1304
 #: plugins/personal/generic/generic.tpl:143
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:574
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/gofax/blocklists/generic.tpl:17
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:890
+#: plugins/admin/groups/class_groupGeneric.inc:892
 #: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/users/class_divListUsers.inc:141
 #: plugins/admin/applications/generic.tpl:42
 #: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:118
+#: plugins/admin/applications/class_divListApplication.inc:134
 #: plugins/admin/departments/generic.tpl:35
 #: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:90
+#: plugins/admin/departments/class_divListDepartment.inc:107
 #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
 #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
 #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:510
+#: plugins/admin/systems/class_terminalGeneric.inc:513
 #: plugins/admin/systems/class_servGeneric.inc:346
 #: plugins/admin/systems/class_workstationGeneric.inc:515
 #: plugins/admin/systems/wingeneric.tpl:13
@@ -2371,76 +2373,83 @@ msgstr "Gebruikers"
 #: plugins/admin/systems/class_componentGeneric.inc:267
 #: plugins/admin/systems/class_glpiSelectUser.inc:167
 #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:148
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:700
+#: plugins/admin/ogroups/class_ogroup.inc:715
 #: plugins/admin/ogroups/class_divListOGroup.inc:145
 #: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:173
 #: plugins/admin/mimetypes/generic.tpl:44
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacro.inc:474
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
-#: plugins/gofon/conference/class_divListConferences.inc:93
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/class_gofonMacro.inc:484
+#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/conference/generic.tpl:49
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
+#: plugins/gofon/conference/class_divListConferences.inc:119
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
 msgid "Surename"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:1325
-#: plugins/addons/addressbook/class_addressbook.inc:520 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
 msgid "Given name"
 msgstr "Naam"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1308
+#: plugins/addons/addressbook/class_addressbook.inc:796
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1309
 #: plugins/personal/generic/generic.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/addons/addressbook/address_edit.tpl:60
+#: plugins/addons/addressbook/address_info.tpl:40
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1310
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1329 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1311
+#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/addons/addressbook/class_addressbook.inc:795
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1332
-#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/generic.tpl:250
+#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
 msgid "Organization"
 msgstr "Organisatie"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1315
 #: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
-#: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/addons/addressbook/address_edit.tpl:155
+#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/address_info.tpl:117
 #: plugins/admin/users/class_divListUsers.inc:56
 #: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/ogroups/class_ogroupManagement.inc:381
@@ -2450,38 +2459,39 @@ msgstr "Organisatie"
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1316
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1317
 #, fuzzy
 msgid "Gender"
 msgstr "Afzender"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1319
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1338
+#: plugins/personal/generic/class_user.inc:1320
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1321
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1322
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/class_addressbook.inc:801
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -2490,56 +2500,62 @@ msgstr "Functie"
 #: plugins/admin/systems/class_workstationGeneric.inc:514
 #: plugins/admin/systems/class_printGeneric.inc:866
 #: plugins/admin/systems/class_glpiAccount.inc:782
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:174
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/class_user.inc:1323
 #: plugins/personal/generic/generic.tpl:360
+#: plugins/addons/addressbook/class_addressbook.inc:804
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:547
-#: html/getxls.php:174 html/getxls.php:236
+#: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:1342
-#: plugins/personal/generic/paste_generic.tpl:22
+#: plugins/personal/generic/class_user.inc:1324
+#: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1343
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1344
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/addons/addressbook/class_addressbook.inc:792
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/addons/addressbook/class_addressbook.inc:794
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1346
+#: plugins/personal/generic/class_user.inc:1328
 #: plugins/personal/nagios/class_nagiosAccount.inc:271
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1347
+#: plugins/personal/generic/class_user.inc:1329
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
 
-#: plugins/personal/generic/class_user.inc:1349 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/addons/addressbook/class_addressbook.inc:802
+#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1350
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/addons/addressbook/class_addressbook.inc:793
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
@@ -2553,7 +2569,7 @@ msgstr "Persoonlijke informatie"
 #: plugins/personal/generic/generic.tpl:38
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:50
+#: plugins/personal/generic/paste_generic.tpl:37
 msgid "Personal picture"
 msgstr "Persoonlijk plaatje"
 
@@ -2591,8 +2607,8 @@ msgstr "Inlognaam"
 msgid "Set"
 msgstr "Stel in"
 
-#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Sex"
 msgstr "Geslacht"
 
@@ -2606,8 +2622,7 @@ msgid "Choose subtree to place user in"
 msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 
 #: plugins/personal/generic/generic.tpl:153
-#: plugins/gofax/blocklists/generic.tpl:21
-#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:40
+#: plugins/gofax/blocklists/generic.tpl:26 plugins/admin/groups/generic.tpl:40
 #: plugins/admin/applications/generic.tpl:52
 #: plugins/admin/departments/generic.tpl:45
 #: plugins/admin/systems/terminal.tpl:28 plugins/admin/systems/server.tpl:32
@@ -2615,21 +2630,21 @@ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 #: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:41
+#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:62
 msgid "Select a base"
 msgstr "Selecteer een basis"
 
 #: plugins/personal/generic/generic.tpl:167
 #: plugins/personal/generic/generic.tpl:368
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_edit.tpl:182
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/addons/addressbook/address_edit.tpl:80
+#: plugins/addons/addressbook/address_edit.tpl:207
+#: plugins/addons/addressbook/address_info.tpl:59
+#: plugins/addons/addressbook/address_info.tpl:155
 #: plugins/admin/departments/generic.tpl:76
 #: plugins/admin/departments/class_departmentGeneric.inc:548
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr "Adres"
 
@@ -2678,16 +2693,17 @@ msgstr "Kamer nr."
 
 #: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:95
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:106
+#: plugins/addons/addressbook/address_info.tpl:75 html/getxls.php:299
 msgid "Mobile"
 msgstr "GSM"
 
 #: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:79
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:246
+#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
+#: html/getxls.php:300
 msgid "Pager"
 msgstr "Pieper"
 
@@ -2706,14 +2722,14 @@ msgstr ""
 "zal dan het wachtwoord versleutelen op de door u geselecteerde methode."
 
 #: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
 msgid "Remove picture"
 msgstr "Plaatje verwijderen"
 
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_edit.tpl:264
 #: plugins/admin/departments/class_departmentManagement.inc:294
 #: plugins/admin/systems/servdns.tpl:21
 #: plugins/admin/systems/servkolab.tpl:246
@@ -2742,17 +2758,17 @@ msgstr "Plaatje verwijderen"
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/goVirusServer.tpl:169
 #: plugins/admin/systems/class_goService.inc:33
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:38
 #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:13
 msgid "Save"
 msgstr "Opslaan"
 
-#: plugins/personal/generic/main.inc:99
+#: plugins/personal/generic/main.inc:102
 msgid "You are not allowed to set your password!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: plugins/personal/generic/main.inc:184
+#: plugins/personal/generic/main.inc:191
 msgid "Generic user information"
 msgstr "Algemene gebruikersinformatie"
 
@@ -2764,9 +2780,9 @@ msgstr "Standaard certificaat"
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
 #: plugins/personal/connectivity/class_kolabAccount.inc:258
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:159
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:579
+#: plugins/admin/groups/class_groupMail.inc:594
 #: plugins/admin/applications/class_applicationParameters.inc:122
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/glpiPrinter.tpl:152
@@ -2778,8 +2794,9 @@ msgstr "Standaard certificaat"
 #: plugins/admin/systems/goMailServer.tpl:73
 #: plugins/admin/systems/goMailServer.tpl:104
 #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
+#: plugins/admin/fai/faiPackage.tpl:78
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -2795,15 +2812,15 @@ msgstr "PKCS12 certificaat"
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/paste_generic.tpl:4
+#: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
 
-#: plugins/personal/generic/paste_generic.tpl:35
+#: plugins/personal/generic/paste_generic.tpl:23
 msgid "Clear password"
 msgstr "Wachtwoord wissen"
 
-#: plugins/personal/generic/paste_generic.tpl:36
+#: plugins/personal/generic/paste_generic.tpl:24
 msgid "Set new password"
 msgstr "Nieuw wachtwoord instellen"
 
@@ -2908,6 +2925,20 @@ msgstr ""
 msgid "PHP GW account settings"
 msgstr "Groep instellingen"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:951
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:310
+#, fuzzy
+msgid "Connectivity addon"
+msgstr "Verbindingen"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "PHPGroupware account"
@@ -3295,7 +3326,7 @@ msgid "GB"
 msgstr "GB"
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:92
-#: plugins/addons/mailqueue/class_mailqueue.inc:323
+#: plugins/addons/mailqueue/class_mailqueue.inc:324
 msgid "hour"
 msgstr "uur"
 
@@ -3476,8 +3507,8 @@ msgid "The environment extension is currently disabled."
 msgstr "De omgevings extensie is momenteel uitgeschakeld."
 
 #: plugins/personal/environment/environment.tpl:14
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:191
+#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:198
 msgid "Environment managment settings"
 msgstr "Omgevingsbeheer instellingen"
 
@@ -3485,116 +3516,116 @@ msgstr "Omgevingsbeheer instellingen"
 msgid "Profile managment"
 msgstr "Profiel beheer"
 
-#: plugins/personal/environment/environment.tpl:26
+#: plugins/personal/environment/environment.tpl:25
 msgid "Use profile managment"
 msgstr "Gebruik profielbeheer"
 
-#: plugins/personal/environment/environment.tpl:33
+#: plugins/personal/environment/environment.tpl:32
 msgid "Profile server managment"
 msgstr "Profielserver beheer"
 
-#: plugins/personal/environment/environment.tpl:36
+#: plugins/personal/environment/environment.tpl:35
 msgid "Profil path"
 msgstr "Profielpad"
 
-#: plugins/personal/environment/environment.tpl:49
+#: plugins/personal/environment/environment.tpl:56
 msgid "Profil quota"
 msgstr "Profiel quota"
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1253
+#: plugins/personal/environment/environment.tpl:73
+#: plugins/personal/environment/class_environment.inc:1282
 msgid "Cache profile localy"
 msgstr "Profiel lokaal cachen"
 
-#: plugins/personal/environment/environment.tpl:75
+#: plugins/personal/environment/environment.tpl:82
 msgid "Kiosk profile settings"
 msgstr "Kiosk profiel instellingen"
 
-#: plugins/personal/environment/environment.tpl:78
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/environment.tpl:85
+#: plugins/personal/environment/class_environment.inc:1288
 msgid "Kiosk profile"
 msgstr "Kiosk profiel"
 
-#: plugins/personal/environment/environment.tpl:88
+#: plugins/personal/environment/environment.tpl:95
 msgid "Manage"
 msgstr "Beheer"
 
-#: plugins/personal/environment/environment.tpl:98
-#: plugins/personal/environment/class_environment.inc:1252
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/class_environment.inc:1281
 msgid "Resolution changeable during session"
 msgstr "Resolutie is binnen de sessie te veranderen"
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/environment.tpl:110
+#: plugins/personal/environment/class_environment.inc:1287
 #: plugins/admin/systems/workstationService.tpl:122
 #: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: plugins/personal/environment/environment.tpl:126
-#: plugins/personal/environment/class_environment.inc:1264
+#: plugins/personal/environment/environment.tpl:133
+#: plugins/personal/environment/class_environment.inc:1293
 #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1114
+#: plugins/admin/systems/class_workstationStartup.inc:1123
 #: plugins/admin/systems/workstationStartup.tpl:158
 #: plugins/admin/systems/terminalStartup.tpl:87
 #: plugins/admin/systems/goShareServer.tpl:1
 msgid "Shares"
 msgstr "Shares"
 
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:143
 msgid "User used to connect to the share"
 msgstr "Te gebruiken gebruikernaam om met de share te verbinden"
 
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:146
 msgid "Select a share"
 msgstr "Selecteer een share"
 
-#: plugins/personal/environment/environment.tpl:147
+#: plugins/personal/environment/environment.tpl:154
 msgid "Mount path"
 msgstr "Mount pad"
 
-#: plugins/personal/environment/environment.tpl:160
+#: plugins/personal/environment/environment.tpl:167
 msgid "Logon scripts"
 msgstr "Login scripts"
 
-#: plugins/personal/environment/environment.tpl:162
+#: plugins/personal/environment/environment.tpl:169
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "Login script beheer"
 
-#: plugins/personal/environment/environment.tpl:196
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/environment.tpl:203
+#: plugins/personal/environment/class_environment.inc:1292
 msgid "Hotplug devices"
 msgstr "Hotplug apparaten"
 
-#: plugins/personal/environment/environment.tpl:198
+#: plugins/personal/environment/environment.tpl:205
 msgid "Hotplug device settings"
 msgstr "Hotplug apparaat instellingen"
 
-#: plugins/personal/environment/environment.tpl:212
+#: plugins/personal/environment/environment.tpl:219
 #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 msgid "New"
 msgstr "Nieuw"
 
-#: plugins/personal/environment/environment.tpl:215
+#: plugins/personal/environment/environment.tpl:222
 msgid "Existing"
 msgstr "Bestaande"
 
-#: plugins/personal/environment/environment.tpl:230
+#: plugins/personal/environment/environment.tpl:237
 msgid "Printer settings"
 msgstr "Printer instellingen"
 
-#: plugins/personal/environment/environment.tpl:247
+#: plugins/personal/environment/environment.tpl:254
 msgid "Toggle admin"
 msgstr "Beheerders omschakeling"
 
-#: plugins/personal/environment/environment.tpl:250
+#: plugins/personal/environment/environment.tpl:257
 msgid "Toggle default"
 msgstr "Standaard omschakeling"
 
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:120
 msgid "User environment settings"
 msgstr "Gebruikersomgeving instellingen"
 
@@ -3629,7 +3660,7 @@ msgstr "Er bestaat al een invoer met deze naam."
 msgid "Please select an entry or press cancel."
 msgstr "Selecteer a.u.b. een regel of druk op annuleren."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/personal/environment/class_selectPrinterDialog.inc:102
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
 msgid "Please select a printer or press cancel."
 msgstr "Selecteer a.u.b. een printer of druk annuleren in"
@@ -3679,34 +3710,52 @@ msgstr ""
 "U heeft een externe resolutie inhaker opgegeven, welke niet gelezen kan "
 "worden. Controleer a.u.b. de rechten op het bestand '%s'."
 
-#: plugins/personal/environment/class_environment.inc:324
-#: plugins/personal/environment/class_environment.inc:362
+#: plugins/personal/environment/class_environment.inc:271
+#, fuzzy, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Setting profile "
+"server to '%s'."
+msgstr ""
+"Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
+"profiel wordt op 'geen' ingesteld."
+
+#: plugins/personal/environment/class_environment.inc:276
+#, fuzzy, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Profile server "
+"configuration is resetted."
+msgstr ""
+"Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
+"profiel wordt op 'geen' ingesteld."
+
+#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:383
 msgid "Remove environment extension"
 msgstr "Verwijder omgevingsmogelijkheden"
 
-#: plugins/personal/environment/class_environment.inc:325
-#: plugins/personal/environment/class_environment.inc:363
+#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:384
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Omgevingsmogelijkheden zijn ingeschakeld. U kunt deze uitschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/environment/class_environment.inc:334
-#: plugins/personal/environment/class_environment.inc:339
-#: plugins/personal/environment/class_environment.inc:368
-#: plugins/personal/environment/class_environment.inc:373
+#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
+#: plugins/personal/environment/class_environment.inc:389
+#: plugins/personal/environment/class_environment.inc:394
 msgid "Add environment extension"
 msgstr "Voeg omgevingsmogelijkheden toe"
 
-#: plugins/personal/environment/class_environment.inc:335
-#: plugins/personal/environment/class_environment.inc:369
+#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:390
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Omgevingsmogelijkheden zijn uitgeschakeld. U kunt deze inschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/environment/class_environment.inc:340
-#: plugins/personal/environment/class_environment.inc:374
+#: plugins/personal/environment/class_environment.inc:361
+#: plugins/personal/environment/class_environment.inc:395
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -3714,45 +3763,45 @@ msgstr ""
 "Omgevingsmogelijkheden zijn uitgeschakeld. U dient een posix account aan te "
 "maken voordat u deze mogelijkheid in kunt schakelen."
 
-#: plugins/personal/environment/class_environment.inc:477
-#: plugins/personal/environment/class_environment.inc:869
+#: plugins/personal/environment/class_environment.inc:498
+#: plugins/personal/environment/class_environment.inc:895
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Geen"
 
-#: plugins/personal/environment/class_environment.inc:491
+#: plugins/personal/environment/class_environment.inc:512
 #, fuzzy
 msgid "You are not allowed to write Logon scripts."
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/personal/environment/class_environment.inc:570
-#: plugins/personal/environment/class_environment.inc:583
+#: plugins/personal/environment/class_environment.inc:591
+#: plugins/personal/environment/class_environment.inc:604
 #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:615
+#: plugins/admin/systems/class_workstationStartup.inc:616
 msgid "You must specify a valid mount point."
 msgstr "U moet een geldig mountpunt opgeven."
 
-#: plugins/personal/environment/class_environment.inc:572
+#: plugins/personal/environment/class_environment.inc:593
 #, fuzzy
 msgid "Spaces are not allowed in the mount path!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: plugins/personal/environment/class_environment.inc:645
-#: plugins/personal/environment/class_environment.inc:646
-#: plugins/personal/environment/class_environment.inc:654
-#: plugins/personal/environment/class_environment.inc:655
+#: plugins/personal/environment/class_environment.inc:672
+#: plugins/personal/environment/class_environment.inc:673
+#: plugins/personal/environment/class_environment.inc:681
+#: plugins/personal/environment/class_environment.inc:682
 msgid "Reset password hash"
 msgstr "Wachtwoord hashwaarde herstellen"
 
-#: plugins/personal/environment/class_environment.inc:659
+#: plugins/personal/environment/class_environment.inc:686
 msgid "Delete share entry"
 msgstr "Verwijder share regel"
 
-#: plugins/personal/environment/class_environment.inc:848
+#: plugins/personal/environment/class_environment.inc:875
 msgid "GOsa default printer flag is not allowed within groups."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:872
+#: plugins/personal/environment/class_environment.inc:898
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -3761,16 +3810,16 @@ msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: plugins/personal/environment/class_environment.inc:911
+#: plugins/personal/environment/class_environment.inc:936
 #, fuzzy, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
 msgstr "Het verwijderen van omgevings informatie is mislukt"
 
-#: plugins/personal/environment/class_environment.inc:980
+#: plugins/personal/environment/class_environment.inc:1005
 msgid "Please set a valid profile quota size."
 msgstr "Geef a.u.b. een geldige profiel quota grootte op."
 
-#: plugins/personal/environment/class_environment.inc:987
+#: plugins/personal/environment/class_environment.inc:1012
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -3778,50 +3827,50 @@ msgstr ""
 "U dient posix mogelijkheden in te schakelen om omgevingsmogelijkheden in te "
 "kunnen schakelen."
 
-#: plugins/personal/environment/class_environment.inc:1025
+#: plugins/personal/environment/class_environment.inc:1050
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Kan de nieuwe kios profielen niet opslaan. Mogelijk is de toegang geweigerd "
 "tot de directory"
 
-#: plugins/personal/environment/class_environment.inc:1164
+#: plugins/personal/environment/class_environment.inc:1189
 #, fuzzy, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
-#: plugins/personal/environment/class_environment.inc:1177
+#: plugins/personal/environment/class_environment.inc:1202
 msgid "group share"
 msgstr "groepsshare"
 
-#: plugins/personal/environment/class_environment.inc:1210
+#: plugins/personal/environment/class_environment.inc:1238
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: plugins/personal/environment/class_environment.inc:1215
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1243
+#: plugins/personal/environment/class_environment.inc:1290
 msgid "Default printer"
 msgstr "Standaard printer"
 
-#: plugins/personal/environment/class_environment.inc:1241
+#: plugins/personal/environment/class_environment.inc:1270
 #, fuzzy
 msgid "Environment settings"
 msgstr "Gebruikersomgeving instellingen"
 
-#: plugins/personal/environment/class_environment.inc:1248
+#: plugins/personal/environment/class_environment.inc:1277
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1284
 #, fuzzy
 msgid "Profile quota"
 msgstr "Profiel quota"
 
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1285
 #, fuzzy
 msgid "Profile server"
 msgstr "Bestandserver"
 
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1291
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Login script"
@@ -3866,11 +3915,11 @@ msgstr "Scriptnaam"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:573
+#: plugins/gofax/blocklists/generic.tpl:51
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
 #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:891
+#: plugins/admin/groups/class_groupGeneric.inc:893
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/applications/class_applicationGeneric.inc:525
 #: plugins/admin/departments/generic.tpl:16
@@ -3888,34 +3937,38 @@ msgstr "Scriptnaam"
 #: plugins/admin/systems/class_goMailServer.inc:695
 #: plugins/admin/systems/class_goShareServer.inc:354
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:701
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/class_faiScript.inc:516
-#: plugins/admin/fai/class_faiTemplate.inc:460
-#: plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/ogroups/class_ogroup.inc:716
+#: plugins/admin/fai/faiVariable.tpl:21
+#: plugins/admin/fai/class_faiScript.inc:527
+#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/faiPackage.tpl:21
+#: plugins/admin/fai/faiPartitionTable.tpl:21
 #: plugins/admin/fai/class_faiScriptEntry.inc:180
 #: plugins/admin/fai/faiScriptEntry.tpl:19
-#: plugins/admin/fai/class_faiPackage.inc:556
-#: plugins/admin/fai/class_faiProfile.inc:446
-#: plugins/admin/fai/class_faiHook.inc:502 plugins/admin/fai/faiProfile.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/class_faiPackage.inc:537
+#: plugins/admin/fai/class_faiProfile.inc:452
+#: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:13
 #: plugins/admin/fai/faiScript.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:17
-#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:21
-#: plugins/admin/fai/class_faiHookEntry.inc:187
+#: plugins/admin/fai/class_faiVariableEntry.inc:143
+#: plugins/admin/fai/faiVariableEntry.tpl:19
+#: plugins/admin/fai/faiTemplate.tpl:21 plugins/admin/fai/faiHook.tpl:21
+#: plugins/admin/fai/class_faiPartitionTable.inc:529
+#: plugins/admin/fai/class_faiHookEntry.inc:189
 #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:393
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiTemplateEntry.inc:248
+#: plugins/admin/fai/faiTemplateEntry.tpl:13
 #: plugins/admin/mimetypes/generic.tpl:35
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/macro/class_gofonMacro.inc:475
-#: plugins/gofon/conference/generic.tpl:56
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
-#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
+#: plugins/gofon/macro/generic.tpl:49
+#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/conference/generic.tpl:78
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:158
+#: html/getxls.php:287
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -3937,30 +3990,30 @@ msgid "Script can be replaced by user"
 msgstr "Script kan vervangen worden door gebruiker"
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/blocklists/generic.tpl:88
+#: plugins/gofax/blocklists/generic.tpl:103
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/addons/notifications/contents.tpl:12
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:332
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:503
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:54
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/admin/fai/class_faiManagement.inc:614
+#: plugins/admin/fai/class_faiManagement.inc:616
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:82
-#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiVariableEntry.tpl:54
 #: plugins/admin/fai/faiHookEntry.tpl:84
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:170
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
 #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
 #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
 msgid "Apply"
@@ -4217,7 +4270,7 @@ msgstr "configuratie informatie bekijken"
 msgid "View system informations"
 msgstr "systeem informatie bekijken"
 
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Nagios instellingen"
 
@@ -4292,15 +4345,19 @@ msgstr "Profielpad"
 msgid "List name"
 msgstr "Lijstnaam"
 
-#: plugins/gofax/blocklists/generic.tpl:10
+#: plugins/gofax/blocklists/generic.tpl:12
 msgid "Name of blocklist"
 msgstr "Naam van de blokkeerlijst"
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
+#: plugins/gofax/blocklists/generic.tpl:20 plugins/admin/groups/generic.tpl:34
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:26
+#: plugins/admin/systems/phone.tpl:20 plugins/admin/systems/workstation.tpl:30
+#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
+#: plugins/gofon/macro/generic.tpl:30
+msgid "Choose subtree to place group in"
+msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 
-#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/gofax/blocklists/generic.tpl:40
 #: plugins/admin/systems/servnfs.tpl:56
 #: plugins/admin/systems/workstationService.tpl:54
 #: plugins/admin/systems/workstationService.tpl:156
@@ -4313,25 +4370,25 @@ msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/class_goShareServer.inc:355
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
 #: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
 msgid "Type"
 msgstr "Type"
 
-#: plugins/gofax/blocklists/generic.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
 
-#: plugins/gofax/blocklists/generic.tpl:48
+#: plugins/gofax/blocklists/generic.tpl:54
 msgid "Descriptive text for this blocklist"
 msgstr "Beschrijving van deze blokkeerlijst"
 
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/gofax/blocklists/generic.tpl:68
 msgid "Blocked numbers"
 msgstr "Geblokkeerde nummers"
 
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:92
 msgid "Numbers can also contain wild cards."
 msgstr "Nummers kunnen ook wildcards (*?) bevatten."
 
@@ -4375,7 +4432,7 @@ msgid "Blocklist management"
 msgstr "Blokkeerlijst beheer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
 msgid "FAX Blocklists"
 msgstr "Fax blokkades"
 
@@ -4392,59 +4449,55 @@ msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 msgid "Please specify a valid phone number."
 msgstr "Geef a.u.b. een geldig telefoonnummer op."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "send"
 msgstr "versturen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "receive"
 msgstr "ontvangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:409
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
 #, fuzzy, php-format
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Het verwijderen van het blokeerlijst object is mislukt"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:449
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "U heeft geen toestemming een blokkeerlijst aan te maken onder deze 'basis'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
 #: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Name' is not set."
 msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Vereist veld 'Naam' bevat ongeldige karakters"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:465
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
 msgid "Specified name is already used."
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:472
-msgid "No permission to create a blocklist on this base."
-msgstr "Geen toestemming om een blokkeerlijst aan te maken onder deze basis."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:520
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Het opslaan van het blokkeerlijst object is mislukt"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:560
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
 #, fuzzy
 msgid "Fax Blocklists"
 msgstr "Fax blokkades"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:572
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/groups/class_groupGeneric.inc:889
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/address_info.tpl:24
+#: plugins/admin/groups/class_groupGeneric.inc:891
 #: plugins/admin/applications/class_applicationGeneric.inc:523
 #: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:514
 #: plugins/admin/systems/class_servGeneric.inc:343
 #: plugins/admin/systems/class_printGeneric.inc:863
 #: plugins/admin/systems/class_componentGeneric.inc:266
@@ -4468,34 +4521,45 @@ msgstr "Fax blokkades"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/admin/systems/class_goShareServer.inc:352
-#: plugins/admin/ogroups/class_ogroup.inc:699
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:714
 #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:515
-#: plugins/admin/fai/class_faiTemplate.inc:459
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiScriptEntry.inc:179
 #: plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/class_faiPackage.inc:555
-#: plugins/admin/fai/class_faiProfile.inc:445
-#: plugins/admin/fai/class_faiHook.inc:501 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:536
+#: plugins/admin/fai/class_faiProfile.inc:451
+#: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/class_faiVariableEntry.inc:142
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/class_faiPartitionTable.inc:498
-#: plugins/admin/fai/class_faiHookEntry.inc:186
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiHookEntry.inc:188
 #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:392
+#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiTemplateEntry.inc:247
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:313
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: plugins/gofon/macro/parameter.tpl:6
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr "Naam"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:575
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#, fuzzy
+msgid "Blocklist"
+msgstr "Blokkeerlijsten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
 #, fuzzy
 msgid "Blocklist type"
 msgstr "Blokkeerlijst naam"
@@ -4560,6 +4624,7 @@ msgstr "Toon ontvangst blokkeerlijsten"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
 #: plugins/admin/acl/class_divListACL.inc:57
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
@@ -4572,243 +4637,242 @@ msgstr "Selecteer om binnen subonderdelen te zoeken"
 msgid "Regular expression for matching list names"
 msgstr "Reguliere expressie voor overeenkomende lijstnamen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:122
 #: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:98
+#: plugins/gofon/conference/class_divListConferences.inc:97
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/addons/godfs/class_dfsManagment.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:122
 #: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:98
+#: plugins/gofon/conference/class_divListConferences.inc:97
 msgid "Root"
 msgstr "Basis"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/users/class_divListUsers.inc:119
+#: plugins/admin/applications/class_divListApplication.inc:119
+#: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/class_glpiSelectUser.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:130
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:99
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/addons/godfs/class_dfsManagment.inc:213
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/users/class_divListUsers.inc:119
+#: plugins/admin/applications/class_divListApplication.inc:119
+#: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/class_glpiSelectUser.inc:163
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:130
 #: plugins/admin/ogroups/phonequeue.tpl:20
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:299
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: plugins/admin/fai/class_faiProfile.inc:304
+#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: include/class_acl.inc:368
 msgid "Up"
 msgstr "Omhoog"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:121
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:132
 #: plugins/admin/ogroups/class_divListOGroup.inc:126
 #: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:102
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:121
+#: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:132
 #: plugins/admin/ogroups/class_divListOGroup.inc:126
 #: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:124
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:102
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Home"
 msgstr "Home"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/departments/class_divListDepartment.inc:79
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:133
 #: plugins/admin/ogroups/class_divListOGroup.inc:128
 #: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:126
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/admin/fai/class_divListFai.inc:141
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
+#: plugins/gofon/macro/class_divListMacros.inc:104
+#: plugins/gofon/conference/class_divListConferences.inc:103
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
 #: plugins/addons/godfs/class_dfsManagment.inc:218
 #: plugins/admin/groups/class_divListGroup.inc:123
 #: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:79
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:136
+#: plugins/admin/departments/class_divListDepartment.inc:96
+#: plugins/admin/departments/class_divListDepartment.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_glpiSelectUser.inc:170
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:121
+#: plugins/admin/systems/class_divListSystem.inc:133
+#: plugins/admin/systems/class_divListSystem.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/admin/acl/class_divListACL.inc:88
 #: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:127
-#: plugins/admin/fai/class_divListFai.inc:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:174
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/gofon/macro/class_divListMacros.inc:104
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/gofon/conference/class_divListConferences.inc:121
 msgid "Submit"
 msgstr "Verwerk"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "Create new blocklist"
 msgstr "Nieuwe blokkeerlijst aanmaken"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "New Blocklist"
 msgstr "Nieuwe blokkeerlijst"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
 #: plugins/addons/godfs/class_dfsManagment.inc:218
 #: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:136
+#: plugins/admin/departments/class_divListDepartment.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:121
+#: plugins/admin/systems/class_divListSystem.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: plugins/admin/fai/class_divListFai.inc:174
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/conference/class_divListConferences.inc:121
 msgid "Submit department"
 msgstr "Verwerk afdeling"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
+#: plugins/admin/groups/class_divListGroup.inc:206
+#: plugins/admin/users/class_divListUsers.inc:255
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/departments/class_divListDepartment.inc:133
 #: plugins/admin/systems/glpiPrinter.tpl:18
 #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
 #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:192
 #: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:276
-#: plugins/admin/fai/class_faiScript.inc:278
-#: plugins/admin/fai/class_faiTemplate.inc:236
-#: plugins/admin/fai/class_faiTemplate.inc:239
-#: plugins/admin/fai/class_faiHook.inc:260
-#: plugins/admin/fai/class_faiHook.inc:263
-#: plugins/admin/fai/class_divListFai.inc:226
-#: plugins/admin/fai/class_divListFai.inc:229
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/macro/class_divListMacros.inc:109
-#: plugins/gofon/macro/class_divListMacros.inc:128
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/fai/class_faiScript.inc:283
+#: plugins/admin/fai/class_faiScript.inc:285
+#: plugins/admin/fai/class_faiTemplate.inc:257
+#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/fai/class_faiHook.inc:294
+#: plugins/admin/fai/class_faiHook.inc:296
+#: plugins/admin/fai/class_divListFai.inc:241
+#: plugins/admin/fai/class_divListFai.inc:244
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
+#: plugins/gofon/macro/class_divListMacros.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:159
+#: plugins/gofon/conference/class_divListConferences.inc:159
 #: include/class_acl.inc:370 include/class_acl.inc:415
 msgid "edit"
 msgstr "Bewerk"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/users/class_divListUsers.inc:250
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
+#: plugins/admin/users/class_divListUsers.inc:256
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/users/class_divListUsers.inc:266
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:192
 #: plugins/admin/ogroups/class_divListOGroup.inc:200
 #: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:280
-#: plugins/admin/fai/class_faiTemplate.inc:240
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_divListFai.inc:237
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/macro/class_divListMacros.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/fai/class_faiScript.inc:287
+#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/admin/fai/class_faiHook.inc:298
+#: plugins/admin/fai/class_divListFai.inc:252
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
+#: plugins/gofon/macro/class_divListMacros.inc:133
+#: plugins/gofon/macro/class_divListMacros.inc:167
+#: plugins/gofon/conference/class_divListConferences.inc:169
 #: include/class_acl.inc:371 include/class_acl.inc:416
 msgid "delete"
 msgstr "Verwijder"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
-#: plugins/admin/users/class_divListUsers.inc:267
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Delete user"
 msgstr "Verwijder gebruiker"
 
@@ -4818,10 +4882,10 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Fax nummer waarop GOfax moet reageren"
 
 #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
 #: plugins/admin/ogroups/phonequeue.tpl:47
-#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Language"
 msgstr "Taal"
 
@@ -4830,7 +4894,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Specificeer de GOfax communicatie taal voor de Fax naar E-mail gateway"
 
 #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Aflever formaat"
 
@@ -4851,12 +4915,12 @@ msgid "Deliver fax as mail to"
 msgstr "Lever Fax als E-mail af aan"
 
 #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Deliver fax as mail"
 msgstr "Lever Fax als E-mail af"
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Lever Fax af op printer"
 
@@ -4912,26 +4976,26 @@ msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
 msgid "Add the list to the blocklists"
 msgstr "Voeg de lijst toe aan de blokkeerlijsten"
 
-#: plugins/gofax/faxaccount/main.inc:98
+#: plugins/gofax/faxaccount/main.inc:110
 msgid "FAX settings"
 msgstr "Fax instellingen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
-#: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_info.tpl:171
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:140
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:143
 msgid "This account has no fax extensions."
 msgstr "Dit account heeft geen Fax mogelijkheden."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
 msgid "Remove fax account"
 msgstr "Fax account verwijderen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -4939,11 +5003,11 @@ msgstr ""
 "Dit account heeft Fax mogelijkheden ingeschakeld. U kunt deze uitschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
 msgid "Create fax account"
 msgstr "Fax account aanmaken"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -4951,39 +5015,39 @@ msgstr ""
 "Dit account heeft Fax mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:216
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:219
 msgid "You're trying to add an invalid phone number."
 msgstr "U probeert een ongeldig telefoonnummer toe te voegen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:425
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:506
-#: plugins/admin/groups/class_groupApplication.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:428
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:509
+#: plugins/admin/groups/class_groupApplication.inc:672
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "terug"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:618
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:621
 #, fuzzy, php-format
 msgid "Removing of user/fax account with dn '%s' failed."
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:633
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
 msgid "The required field 'Fax' is not set."
 msgstr "Het vereiste veld 'Fax' is leeg."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Voer a.u.b. een geldig Fax nummer bij het 'Fax' veld in."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:645
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr "E-mail aflevering staat aan, alleen is er geen adres opgegeven."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:650
 msgid "The mail address you've entered is invalid."
 msgstr "Het E-mail adres dat u opgegeven heeft is ongeldig."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:656
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -4991,31 +5055,31 @@ msgstr ""
 "Fax afleveren op een printer is alleen mogelijk indien een geldige printer "
 "is opgegeven. Corrigeer uw keuze a.u.b."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:735
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy, php-format
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:806
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:812
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Samba Instellingen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
 msgid "Enable/Disable fax"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:816
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Toon ontvangst blokkeerlijsten"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Toon verstuur blokkeerlijsten"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Alternatieve Fax nummers"
@@ -5027,7 +5091,7 @@ msgid "Filter"
 msgstr "Filter"
 
 #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/addressbook/contents.tpl:106
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
@@ -5057,7 +5121,7 @@ msgid "during"
 msgstr "gedurende"
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
+#: plugins/addons/logview/contents.tpl:68
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
@@ -5068,13 +5132,15 @@ msgstr "Zoeken"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/systems/class_printGeneric.inc:842
 #: plugins/admin/ogroups/class_ogroupManagement.inc:378
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/fai/faiTemplateEntry.tpl:110
 msgid "User"
 msgstr "Gebruiker"
 
 #: plugins/gofax/faxreports/contents.tpl:31
+#: plugins/gofax/faxreports/class_faxreport.inc:481
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: plugins/gofon/fonreports/class_fonreport.inc:398
 msgid "Date"
 msgstr "Datum"
 
@@ -5115,18 +5181,22 @@ msgid "Date / Time"
 msgstr "Datum / Tijd"
 
 #: plugins/gofax/faxreports/detail.tpl:29
+#: plugins/gofax/faxreports/class_faxreport.inc:484
 msgid "Sender MSN"
 msgstr "Afzender MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:33
+#: plugins/gofax/faxreports/class_faxreport.inc:483
 msgid "Sender ID"
 msgstr "Afzender ID"
 
 #: plugins/gofax/faxreports/detail.tpl:37
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 msgid "Receiver MSN"
 msgstr "Ontvanger MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:41
+#: plugins/gofax/faxreports/class_faxreport.inc:485
 msgid "Receiver ID"
 msgstr "Ontvanger ID"
 
@@ -5135,10 +5205,11 @@ msgid "Status message"
 msgstr "Status bericht"
 
 #: plugins/gofax/faxreports/detail.tpl:53
+#: plugins/gofax/faxreports/class_faxreport.inc:489
 msgid "Transfer time"
 msgstr "Overdrachtstijd"
 
-#: plugins/gofax/faxreports/main.inc:18
+#: plugins/gofax/faxreports/main.inc:14
 msgid "FAX reports"
 msgstr "Fax rapporten"
 
@@ -5146,53 +5217,93 @@ msgstr "Fax rapporten"
 msgid "FAX Reports"
 msgstr "Fax rapporten"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
+#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:117
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/addons/logview/class_logview.inc:75
+#: plugins/gofon/fonreports/class_fonreport.inc:163
 msgid "There is no mysql extension available, please check your php setup."
 msgstr ""
 "Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
 
-#: plugins/gofax/faxreports/class_faxreport.inc:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
+#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:126
 msgid "Can't select fax database for report generation!"
 msgstr "Kan de Fax database voor rapportage niet selecteren!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:266
+#: plugins/gofax/faxreports/class_faxreport.inc:149
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "De zoekopdracht op de Fax database is mislukt!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:157
+#: plugins/gofax/faxreports/class_faxreport.inc:158
+#: plugins/gofax/faxreports/class_faxreport.inc:168
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-#: plugins/gofon/fonreports/class_fonreport.inc:202
+#: plugins/gofax/faxreports/class_faxreport.inc:196
+#: plugins/gofax/faxreports/class_faxreport.inc:311
+#: plugins/gofon/fonreports/class_fonreport.inc:221
 msgid "Y-M-D"
 msgstr "J-M-D"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:389
-#: plugins/gofax/faxreports/class_faxreport.inc:390
+#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+#, fuzzy
+msgid "Insufficient permissions to view this attribute"
+msgstr ""
+"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/admin/groups/class_groupApplication.inc:427
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+#, fuzzy
+msgid "Insufficient permissions"
+msgstr "Rechten"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:469
+#: plugins/gofax/faxreports/class_faxreport.inc:470
 #, fuzzy
 msgid "Fax report"
 msgstr "Fax rapporten"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:399
+#: plugins/gofax/faxreports/class_faxreport.inc:470
+#, fuzzy
+msgid "All entries are readonly"
+msgstr "Alle velden zijn aanpasbaar"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:479
 #, fuzzy
 msgid "Detailed view"
 msgstr "Geinstalleerde apparaten"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:480
+#, fuzzy
+msgid "Fax ID"
+msgstr "Fax ID"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:481
+#, fuzzy
+msgid "Time"
+msgstr "MIME"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:487
+#, fuzzy
+msgid "Number of pages"
+msgstr "Naam van de afdeling"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:488
+#, fuzzy
+msgid "Status Message"
+msgstr "Status bericht"
+
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_info.tpl:53
 msgid "Private"
 msgstr "Privé"
 
@@ -5211,48 +5322,48 @@ msgstr ""
 "bijvoorbeeld 'Gonicus' vinden. Gebruik de selectie mogelijkheden om uw "
 "zoekopdracht verder te verfijnen."
 
-#: plugins/addons/addressbook/contents.tpl:47
+#: plugins/addons/addressbook/contents.tpl:48
 msgid "Add entry"
 msgstr "Record toevoegen"
 
-#: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:743
+#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/admin/groups/class_groupApplication.inc:754
 msgid "Edit entry"
 msgstr "Invoer bewerken"
 
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:55
 msgid "Remove entry"
 msgstr "Record verwijderen"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Select to see regular users"
 msgstr "Selecteer om gewone gebruikers te tonen"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Show organizational entries"
 msgstr "Toon gebruikers binnen de organisatie"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Select to see users in addressbook"
 msgstr "Selecteer om gebruikers in het adresboek te zien"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Show addressbook entries"
 msgstr "Toon adresboek records"
 
-#: plugins/addons/addressbook/contents.tpl:77
+#: plugins/addons/addressbook/contents.tpl:81
 msgid "Display results for department"
 msgstr "Toon resultaten voor afdeling"
 
-#: plugins/addons/addressbook/contents.tpl:90
+#: plugins/addons/addressbook/contents.tpl:94
 msgid "Match object"
 msgstr "Zoek op"
 
-#: plugins/addons/addressbook/contents.tpl:93
+#: plugins/addons/addressbook/contents.tpl:97
 msgid "Choose the object that will be searched in"
 msgstr "Selecteer het object waarbinnen gezocht zal worden"
 
-#: plugins/addons/addressbook/contents.tpl:105
+#: plugins/addons/addressbook/contents.tpl:109
 msgid "Search string"
 msgstr "Zoekstring"
 
@@ -5261,10 +5372,10 @@ msgid "Dial connection..."
 msgstr "Bel..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:374
-#: plugins/addons/addressbook/class_addressbook.inc:378
-#: plugins/addons/addressbook/class_addressbook.inc:460
+#: plugins/addons/addressbook/class_addressbook.inc:427
+#: plugins/addons/addressbook/class_addressbook.inc:434
+#: plugins/addons/addressbook/class_addressbook.inc:438
+#: plugins/addons/addressbook/class_addressbook.inc:551
 msgid "Dial"
 msgstr "Kies"
 
@@ -5283,58 +5394,61 @@ msgid "Choose the department to store entry in"
 msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
 
 #: plugins/addons/addressbook/address_edit.tpl:24
-#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_info.tpl:18
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
+#: html/getxls.php:298
 msgid "Initials"
 msgstr "Initialen"
 
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:118
+#: plugins/addons/addressbook/address_info.tpl:83
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr "E-mail"
 
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:134
+#: plugins/addons/addressbook/address_info.tpl:99
 msgid "Organizational"
 msgstr "Bedrijfsmatig"
 
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:143
+#: plugins/addons/addressbook/address_info.tpl:109
 msgid "Company"
 msgstr "Bedrijf"
 
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:167
+#: plugins/addons/addressbook/address_info.tpl:125 html/getxls.php:225
+#: html/getxls.php:298
 msgid "City"
 msgstr "Plaats"
 
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:191
+#: plugins/addons/addressbook/address_info.tpl:141
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Country"
 msgstr "Land"
 
-#: plugins/addons/addressbook/main.inc:37
+#: plugins/addons/addressbook/main.inc:35
 msgid "Address book"
 msgstr "Adresboek"
 
 #: plugins/addons/addressbook/class_addressbook.inc:6
+#: plugins/addons/addressbook/class_addressbook.inc:781
+#: plugins/addons/addressbook/class_addressbook.inc:787
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: plugins/addons/addressbook/class_addressbook.inc:160
+#: plugins/addons/addressbook/class_addressbook.inc:172
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Nu van %s naar %s bellen?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:164
+#: plugins/addons/addressbook/class_addressbook.inc:176
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -5342,82 +5456,89 @@ msgstr ""
 "U heeft geen privé telefoonnummer opgegeven. Verander dit a.u.b. om direkt "
 "te kunnen kiezen"
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:657
+#: plugins/addons/addressbook/class_addressbook.inc:202
+#: plugins/addons/addressbook/class_addressbook.inc:751
 #, fuzzy, php-format
 msgid "Removing of addressbook entry '%s' failed."
 msgstr "Het verwijderen van de adresboek invoer is mislukt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:194
-#: plugins/addons/addressbook/class_addressbook.inc:295
+#: plugins/addons/addressbook/class_addressbook.inc:209
+#: plugins/addons/addressbook/class_addressbook.inc:318
 msgid "You are not allowed to delete this entry!"
 msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:289
+#: plugins/addons/addressbook/class_addressbook.inc:312
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "U staat op het punt de invoer %s te verwijderen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:384
+#: plugins/addons/addressbook/class_addressbook.inc:444
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Sla contact voor %s op als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:388
+#: plugins/addons/addressbook/class_addressbook.inc:450
 #, php-format
 msgid "Send mail to %s"
 msgstr "Stuur E-mail naar %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:563
 msgid "global addressbook"
 msgstr "globaal adresboek"
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:566
 msgid "user database"
 msgstr "gebruiker database"
 
-#: plugins/addons/addressbook/class_addressbook.inc:479
+#: plugins/addons/addressbook/class_addressbook.inc:570
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contact opgeslagen in '%s'"
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "Creating new entry in"
 msgstr "Maak record aan in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/logview/class_logview.inc:94
-#: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:305
-#: plugins/addons/mailqueue/class_mailqueue.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/logview/class_logview.inc:112
+#: plugins/addons/logview/class_logview.inc:133
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Work phone"
 msgstr "Telefoon Werk"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Cell phone"
 msgstr "GSM"
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
 msgid "Home phone"
 msgstr "Telefoon Privé"
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:702
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Kan geen unieke DN aanmaken voor uw invoer. Vul a.u.b. meer formulier velden "
 "in."
 
-#: plugins/addons/addressbook/class_addressbook.inc:612
-msgid ""
-"You have no permissions to create or modify a global address book entry."
-msgstr ""
-"U heeft geen toestemming om globale adresboek invoeren te wijzigen of aan te "
-"maken."
+#: plugins/addons/addressbook/class_addressbook.inc:782
+#, fuzzy
+msgid "Addressbook entry acls"
+msgstr "Het opslaan van de adresboek invoer is mislukt"
+
+#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+msgid "Title"
+msgstr "Titel"
+
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
+msgid "Common name"
+msgstr "Algemene naam"
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
 msgid ""
@@ -5455,7 +5576,7 @@ msgstr "Hier is het statusraport voor de import:"
 msgid "Selected Template"
 msgstr "Geselecteerd Sjabloon"
 
-#: plugins/addons/ldapmanager/main.inc:40
+#: plugins/addons/ldapmanager/main.inc:34
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr "LDAP beheer"
@@ -5465,51 +5586,51 @@ msgstr "LDAP beheer"
 msgid "LDIF export"
 msgstr "LDIF export"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:101
+#: plugins/addons/ldapmanager/class_csvimport.inc:98
 msgid "You've no permission to do CSV imports."
 msgstr "U heeft geen toestemming om CSV gegevens te importeren."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:161
+#: plugins/addons/ldapmanager/class_csvimport.inc:159
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "'sn', 'givenName' en 'uid' zijn nodig om een gebruiker aan te maken"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:209
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "failed"
 msgstr "mislukt"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:213
+#: plugins/addons/ldapmanager/class_csvimport.inc:211
 msgid "ok"
 msgstr "okee"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:277
+#: plugins/addons/ldapmanager/class_csvimport.inc:275
 msgid "status"
 msgstr "status"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:281
+#: plugins/addons/ldapmanager/class_csvimport.inc:279
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Er is een fout opgetreden bij het invoegen van invoer %s - Het proces is "
 "afgebroken"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:319
+#: plugins/addons/ldapmanager/class_csvimport.inc:317
 msgid "Nothing to import!"
 msgstr "Er is niets te importeren!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:331
-#: plugins/addons/ldapmanager/class_csvimport.inc:342
-#: plugins/addons/ldapmanager/class_csvimport.inc:347
-#: plugins/addons/ldapmanager/class_import.inc:62
-#: plugins/addons/ldapmanager/class_import.inc:70
+#: plugins/addons/ldapmanager/class_csvimport.inc:329
+#: plugins/addons/ldapmanager/class_csvimport.inc:340
+#: plugins/addons/ldapmanager/class_csvimport.inc:345
+#: plugins/addons/ldapmanager/class_import.inc:61
+#: plugins/addons/ldapmanager/class_import.inc:69
 msgid "There is no file uploaded."
 msgstr "Er is geen bestand ge-upload."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:336
-#: plugins/addons/ldapmanager/class_import.inc:55
+#: plugins/addons/ldapmanager/class_csvimport.inc:334
+#: plugins/addons/ldapmanager/class_import.inc:54
 msgid "The specified file is empty."
 msgstr "Het opgegeven bestand is leeg."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:490
+#: plugins/addons/ldapmanager/class_csvimport.inc:488
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Het geselecteerde bestand bevat geen enkele CSV data..."
 
@@ -5547,11 +5668,11 @@ msgstr "Het verwijderen van DNS regels is mislukt"
 msgid "Import successful"
 msgstr "Import was succesvol"
 
-#: plugins/addons/ldapmanager/class_import.inc:41
-msgid "You've no permission to do LDAP imports."
-msgstr "U heeft geen toestemming om LDAP gegevens te importeren."
+#: plugins/addons/ldapmanager/class_import.inc:45
+msgid "You need full access to all objects, to execute the import command."
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:108
+#: plugins/addons/ldapmanager/class_import.inc:102
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
@@ -5600,20 +5721,31 @@ msgstr "Klik hier om de complete LDAP database op te slaan in een bestand."
 msgid "Click here to save the LDAP Export "
 msgstr "Klik hier om de LDAP export op te slaan in een bestand."
 
+#: plugins/addons/ldapmanager/class_ldif.inc:35
+#, fuzzy
+msgid "Ldap manager"
+msgstr "LDAP beheer"
+
+#: plugins/addons/ldapmanager/class_ldif.inc:41
+#, fuzzy
+msgid "Ldap manager addon"
+msgstr "LDAP beheer"
+
 #: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "CSV import"
 
-#: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-msgid "You've no permission to do LDAP exports."
-msgstr "U heeft geen toestemming om LDAP gegevens te exporteren."
-
-#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_export.inc:77
 #: plugins/addons/ldapmanager/class_exportxls.inc:89
 msgid "Error while exporting the requested entries!"
 msgstr "Fout bij het exporteren van de gevraagde gegevens!"
 
+#: plugins/addons/ldapmanager/class_export.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#, fuzzy, php-format
+msgid "You are not allowed to export the given ldap entry (%s)"
+msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
+
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
 msgid ""
 "The XLS export plugin provides methods to download a complete snapshot of "
@@ -5677,66 +5809,86 @@ msgstr "Computernaam"
 msgid "Message"
 msgstr "Bericht"
 
-#: plugins/addons/logview/main.inc:33
+#: plugins/addons/logview/main.inc:36
 msgid "System log view"
 msgstr "Systeem log weergave"
 
 #: plugins/addons/logview/class_logview.inc:6
+#: plugins/addons/logview/class_logview.inc:390
 msgid "System logs"
 msgstr "Systeem logs"
 
-#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:71
 msgid "No LOG servers defined!"
 msgstr "Geen LOG servers gedefiniëerd!"
 
-#: plugins/addons/logview/class_logview.inc:73
-#: plugins/addons/logview/class_logview.inc:168
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:182
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 "Kan niet met de log database verbinden. Logs kunnen niet getoond worden!"
 
-#: plugins/addons/logview/class_logview.inc:77
-#: plugins/addons/logview/class_logview.inc:171
+#: plugins/addons/logview/class_logview.inc:92
+#: plugins/addons/logview/class_logview.inc:185
 msgid "Can't select log database for log generation!"
 msgstr "Kan de log database voor log generatie niet selecteren!"
 
-#: plugins/addons/logview/class_logview.inc:86
-#: plugins/addons/logview/class_logview.inc:103
+#: plugins/addons/logview/class_logview.inc:104
+#, fuzzy
+msgid "Query for log database failed!. Requesting host names failed."
+msgstr "Zoekopdracht binnen de log database is mislukt!"
+
+#: plugins/addons/logview/class_logview.inc:125
 msgid "Query for log database failed!"
 msgstr "Zoekopdracht binnen de log database is mislukt!"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "one hour"
 msgstr "1 uur"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "6 hours"
 msgstr "6 uur"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "12 hours"
 msgstr "12 uur"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "24 hours"
 msgstr "24 uur"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "2 days"
 msgstr "2 dagen"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "one week"
 msgstr "1 week"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "2 weeks"
 msgstr "2 weken"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "one month"
 msgstr "1 maand"
 
+#: plugins/addons/logview/class_logview.inc:163
+#, fuzzy
+msgid "You have insufficient permissions to view syslog entries."
+msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
+
+#: plugins/addons/logview/class_logview.inc:384
+#, fuzzy
+msgid "Log view"
+msgstr "Log DB gebruiker"
+
+#: plugins/addons/logview/class_logview.inc:385
+#, fuzzy
+msgid "Log view addon"
+msgstr "Omlaag verplaatsen"
+
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr "Geef hier a.u.b. een zoekwaarde op."
@@ -5762,6 +5914,7 @@ msgid "Remove all messages from selected servers queue"
 msgstr "Verwijder alle berichten uit de wachtrij van de geselecteerde server"
 
 #: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/class_mailqueue.inc:394
 msgid "Hold all messages"
 msgstr "Plaats alle berichten in wachtstand"
 
@@ -5779,6 +5932,7 @@ msgid "Release all messages in selected servers queue"
 msgstr "Geef alle berichten in de geselecteerde server wachtrij vrij"
 
 #: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/class_mailqueue.inc:396
 msgid "Requeue all messages"
 msgstr "Plaats alle berichten opnieuw in wachtrij"
 
@@ -5807,7 +5961,7 @@ msgid "Error"
 msgstr "Fout"
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Active"
 msgstr "Actief"
 
@@ -5828,6 +5982,7 @@ msgid "hold"
 msgstr "wachtstand"
 
 #: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/class_mailqueue.inc:398
 msgid "Hold message"
 msgstr "Bericht in wachtstand plaatsen"
 
@@ -5847,7 +6002,7 @@ msgstr "header"
 msgid "Display header from this message"
 msgstr "Toon de header van dit bericht"
 
-#: plugins/addons/mailqueue/main.inc:38
+#: plugins/addons/mailqueue/main.inc:42
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Mail wachtrij"
@@ -5862,7 +6017,7 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
-#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#: plugins/addons/mailqueue/class_mailqueue.inc:199
 #, fuzzy, php-format
 msgid ""
 "You do not have permission to execute the command '%s' on the mailqueue."
@@ -5872,45 +6027,94 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:121
 #: plugins/addons/mailqueue/class_mailqueue.inc:181
-#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#: plugins/addons/mailqueue/class_mailqueue.inc:214
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 "Controleer uw 'gosa.conf' a.u.b. De opgegeven '%s' kan niet uitgevoerd "
 "worden."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:225
+#: plugins/addons/mailqueue/class_mailqueue.inc:226
 msgid "There are no mail server specified."
 msgstr "Er is geen E-mail server gespecificeerd."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:275
+#: plugins/addons/mailqueue/class_mailqueue.inc:276
 msgid "up"
 msgstr "omhoog"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:277
+#: plugins/addons/mailqueue/class_mailqueue.inc:278
 msgid "down"
 msgstr "omlaag"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:320
+#: plugins/addons/mailqueue/class_mailqueue.inc:321
 msgid "no limit"
 msgstr "geen limiet"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/addons/mailqueue/class_mailqueue.inc:326
 msgid "hours"
 msgstr "uren"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:371
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Hold"
 msgstr "Wacht"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:372
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Un hold"
 msgstr "Uit de wacht"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:374
+#: plugins/addons/mailqueue/class_mailqueue.inc:375
 msgid "Not active"
 msgstr "Niet actief"
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:384
+#, fuzzy
+msgid "Mailqueue"
+msgstr "Mail wachtrij"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:385
+#, fuzzy
+msgid "Mailqueue addon"
+msgstr "Mail wachtrij"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:390
+#, fuzzy
+msgid "Mail queue addon"
+msgstr "Mail wachtrij"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:393
+#, fuzzy
+msgid "Unhold all messages"
+msgstr "Plaats alle berichten in wachtstand"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:395
+#, fuzzy
+msgid "Delete all messages"
+msgstr "Geef alle berichten vrij"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:397
+#, fuzzy
+msgid "Unhold message"
+msgstr "Bericht in wachtstand plaatsen"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:399
+#, fuzzy
+msgid "Delete message"
+msgstr "Verwijder dit bericht"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:400
+#, fuzzy
+msgid "Requeue message"
+msgstr "Herplaats dit bericht"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:401
+msgid "Gathering queue data"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:402
+#, fuzzy
+msgid "Get header information"
+msgstr "Algemene gebruikersinformatie"
+
 #: plugins/addons/godfs/contents.tpl:8
 msgid "DFS Shares"
 msgstr "DFS shares"
@@ -5979,7 +6183,7 @@ msgid "Create new dfsshare"
 msgstr "Maak een nieuwe DFS share aan"
 
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
+#: ihtml/themes/default/copyPasteDialog.tpl:22
 msgid "Finish"
 msgstr "Opslaan"
 
@@ -6030,8 +6234,8 @@ msgstr "Beroep"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:886 include/class_acl.inc:164
-#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
+#: plugins/admin/groups/class_groupGeneric.inc:888 include/class_acl.inc:164
+#: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
 msgid "Groups"
 msgstr "Groepen"
 
@@ -6119,14 +6323,14 @@ msgstr ""
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:621
-#: plugins/admin/fai/class_faiManagement.inc:627
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/fai/class_faiManagement.inc:629
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Continue"
 msgstr "Doorgaan"
 
@@ -6164,7 +6368,7 @@ msgstr "Toon overeenkomende adressen"
 
 #: plugins/admin/groups/generic.tpl:6 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:689
 msgid "Group name"
 msgstr "Groepnaam"
 
@@ -6176,13 +6380,6 @@ msgstr "POSIX naam van de groep"
 msgid "Descriptive text for this group"
 msgstr "Omschrijving voor deze groep"
 
-#: plugins/admin/groups/generic.tpl:34 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/server.tpl:26 plugins/admin/systems/phone.tpl:20
-#: plugins/admin/systems/workstation.tpl:30
-#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
-msgid "Choose subtree to place group in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
-
 #: plugins/admin/groups/generic.tpl:53
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
@@ -6232,13 +6429,13 @@ msgstr ""
 msgid "Group administration"
 msgstr "Groepen beheer"
 
-#: plugins/admin/groups/class_groupManagement.inc:241
+#: plugins/admin/groups/class_groupManagement.inc:243
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "U staat op het punt de groep '%s' te verwijderen."
 
-#: plugins/admin/groups/class_groupManagement.inc:247
-#: plugins/admin/groups/class_groupManagement.inc:278
+#: plugins/admin/groups/class_groupManagement.inc:249
+#: plugins/admin/groups/class_groupManagement.inc:281
 msgid "You are not allowed to delete this group!"
 msgstr "U heeft geen toestemming om deze groep te verwijderen!"
 
@@ -6248,36 +6445,36 @@ msgstr ""
 "Kan de SID van deze groep niet vinden in de LDAP database of in uw "
 "configuratie bestand."
 
-#: plugins/admin/groups/class_groupGeneric.inc:173
+#: plugins/admin/groups/class_groupGeneric.inc:175
 msgid "This 'dn' is no group."
 msgstr "Deze 'dn' is geen groep."
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Samba group"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain admins"
 msgstr "Windows beheerders"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:326
 msgid "Domain guests"
 msgstr "Windows gasten"
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:331
 #, php-format
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:444
 msgid "! unknown id"
 msgstr "! onbekend id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:481
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6285,29 +6482,29 @@ msgstr ""
 "Uw zoekopdracht gaf meer dan '%s' gebruikers terug. Slechts '%s' gebruikers "
 "worden getoond."
 
-#: plugins/admin/groups/class_groupGeneric.inc:508
-#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/groups/class_groupGeneric.inc:510
+#: plugins/admin/groups/class_groupGeneric.inc:718
 #, fuzzy, php-format
 msgid "Removing of groups/generic with dn '%s' failed."
 msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:628
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr "Er kon geen geconfigureerde SID gevonden worden voor '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:633
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr "Er kon geen geconfigureerde RIDBASE gevonden worden voor '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:744
 #: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:593
+#: plugins/admin/ogroups/class_ogroup.inc:608
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:754
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -6315,43 +6512,43 @@ msgstr ""
 "Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
 "liggende streepjes zijn toegestaan."
 
-#: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
+#: plugins/admin/groups/class_groupGeneric.inc:765
+#: plugins/admin/groups/class_groupGeneric.inc:779
+#: plugins/admin/groups/class_groupGeneric.inc:786
 msgid "Value specified as 'Name' is already used."
 msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:881
+#: plugins/admin/groups/class_groupGeneric.inc:883
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:893
+#: plugins/admin/groups/class_groupGeneric.inc:895
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:894
+#: plugins/admin/groups/class_groupGeneric.inc:896
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios account"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:899
 #, fuzzy
 msgid "Group member"
 msgstr "Groepsleden"
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:900
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:899
+#: plugins/admin/groups/class_groupGeneric.inc:901
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba home"
 
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:902
 #, fuzzy
 msgid "Samba SID"
 msgstr "Samba"
@@ -6376,81 +6573,90 @@ msgstr "Categorie toevoegen"
 msgid "Available applications"
 msgstr "Beschikbare programma's"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:565
+#: plugins/admin/groups/class_groupMail.inc:285 include/class_acl.inc:565
 #: include/class_acl.inc:656
 msgid "read"
 msgstr "alleen lezen"
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "post"
 msgstr "afleveren & lezen"
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "external post"
 msgstr "alleen afleveren"
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "append"
 msgstr "afleveren, lezen & kopieren"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:566
+#: plugins/admin/groups/class_groupMail.inc:289 include/class_acl.inc:566
 #: include/class_acl.inc:658
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Deze 'dn' heeft geen geldige E-mail mogelijkheden."
 
-#: plugins/admin/groups/class_groupMail.inc:394
+#: plugins/admin/groups/class_groupMail.inc:349
+#, fuzzy
+msgid "Remove shared folder from mail server database"
+msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
+
+#: plugins/admin/groups/class_groupMail.inc:350
+msgid "Remove the shared folder and all its contents from mail server."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:409
 msgid "You're trying to add an invalid email address "
 msgstr "U probeert een ongeldig E-mail adres toe te voegen"
 
-#: plugins/admin/groups/class_groupMail.inc:395
+#: plugins/admin/groups/class_groupMail.inc:410
 msgid "to the list of forwarders."
 msgstr "aan de lijst met doorstuur adressen."
 
-#: plugins/admin/groups/class_groupMail.inc:653
+#: plugins/admin/groups/class_groupMail.inc:669
 #, fuzzy, php-format
 msgid "Removing of groups/mail with dn '%s' failed."
 msgstr "Het verwijderen van de groeps E-mail instellingen is mislukt"
 
-#: plugins/admin/groups/class_groupMail.inc:825
+#: plugins/admin/groups/class_groupMail.inc:851
 #, fuzzy, php-format
 msgid "Saving of groups/mail with dn '%s' failed."
 msgstr "Het opslaan van de groep E-mail instellingen is mislukt"
 
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:880
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Geef a.u.b. een geldig email adres op in het 'Primair adres' veld."
 
-#: plugins/admin/groups/class_groupMail.inc:887
+#: plugins/admin/groups/class_groupMail.inc:913
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Kies a.u.b. geldige permissie instellingen. Standaard permissies kunnen niet "
 "leeg zijn."
 
-#: plugins/admin/groups/class_groupMail.inc:891
+#: plugins/admin/groups/class_groupMail.inc:917
 msgid "Please select a valid mail server."
 msgstr "Selecteer a.u.b. een geldig mailserver"
 
-#: plugins/admin/groups/class_groupMail.inc:1029
+#: plugins/admin/groups/class_groupMail.inc:1055
 #, fuzzy
 msgid "Group mail"
 msgstr "Groepnaam"
 
-#: plugins/admin/groups/class_groupMail.inc:1037
+#: plugins/admin/groups/class_groupMail.inc:1063
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Alternatieve adressen"
 
-#: plugins/admin/groups/class_groupMail.inc:1038
+#: plugins/admin/groups/class_groupMail.inc:1064
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Primair adres"
 
-#: plugins/admin/groups/class_groupMail.inc:1041
+#: plugins/admin/groups/class_groupMail.inc:1067
 #: plugins/admin/systems/printer.tpl:82
 #: plugins/admin/systems/class_printGeneric.inc:869
 msgid "Permissions"
@@ -6492,15 +6698,15 @@ msgstr "Toon gebruikers van afdeling"
 msgid "Regular expression for matching user names"
 msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
 
-#: plugins/admin/groups/class_groupApplication.inc:395
+#: plugins/admin/groups/class_groupApplication.inc:407
 msgid "This 'dn' is no appgroup."
 msgstr "Deze 'dn' is geen programmagroep"
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:415
 msgid "Remove applications"
 msgstr "Programma's verwijderen"
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:416
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6508,11 +6714,11 @@ msgstr ""
 "Deze groep heeft programma mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupApplication.inc:406
+#: plugins/admin/groups/class_groupApplication.inc:418
 msgid "Create applications"
 msgstr "Programma's aanmaken"
 
-#: plugins/admin/groups/class_groupApplication.inc:407
+#: plugins/admin/groups/class_groupApplication.inc:419
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6520,79 +6726,90 @@ msgstr ""
 "Deze groep heeft programma mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupApplication.inc:420
+#: plugins/admin/groups/class_groupApplication.inc:426
+#: include/class_tabs.inc:303
+msgid "ACL"
+msgstr "Rechten"
+
+#: plugins/admin/groups/class_groupApplication.inc:429
+msgid ""
+"You do not have permission to query application entries. All your changes "
+"will not be saved."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:442
 msgid "Invalid character in category name."
 msgstr "De categorienaam bevat ongeldige karakters."
 
-#: plugins/admin/groups/class_groupApplication.inc:428
+#: plugins/admin/groups/class_groupApplication.inc:450
 msgid "The specified category already exists."
 msgstr "De opgegeven categorie bestaat al."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "De geselecteerde programma naam is niet uniek. Controleeer uw LDAP database."
 
-#: plugins/admin/groups/class_groupApplication.inc:562
+#: plugins/admin/groups/class_groupApplication.inc:594
 msgid "The selected application has no options."
 msgstr "Het geselecteerde programma heeft geen opties."
 
-#: plugins/admin/groups/class_groupApplication.inc:650
-#: plugins/admin/departments/class_divListDepartment.inc:137
+#: plugins/admin/groups/class_groupApplication.inc:680
+#: plugins/admin/departments/class_divListDepartment.inc:154
 msgid "department"
 msgstr "afdeling"
 
-#: plugins/admin/groups/class_groupApplication.inc:658
+#: plugins/admin/groups/class_groupApplication.inc:689
 msgid "application"
 msgstr "programma"
 
-#: plugins/admin/groups/class_groupApplication.inc:694
-#: plugins/admin/groups/class_groupApplication.inc:736
+#: plugins/admin/groups/class_groupApplication.inc:705
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "Delete entry"
 msgstr "Verwijder invoer"
 
-#: plugins/admin/groups/class_groupApplication.inc:696
-#: plugins/admin/groups/class_groupApplication.inc:731
+#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:741
 msgid "Move up"
 msgstr "Omhoog verplaatsen"
 
-#: plugins/admin/groups/class_groupApplication.inc:699
-#: plugins/admin/groups/class_groupApplication.inc:734
+#: plugins/admin/groups/class_groupApplication.inc:710
+#: plugins/admin/groups/class_groupApplication.inc:744
 msgid "Move down"
 msgstr "Omlaag verplaatsen"
 
-#: plugins/admin/groups/class_groupApplication.inc:729
+#: plugins/admin/groups/class_groupApplication.inc:739
 msgid "Insert seperator"
 msgstr "Scheidingsteken invoegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:769
+#: plugins/admin/groups/class_groupApplication.inc:784
 msgid "This application is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/admin/groups/class_groupApplication.inc:772
+#: plugins/admin/groups/class_groupApplication.inc:787
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr "Deze applicatie is niet beschikbaar in enige uitgave %s genaamd."
 
-#: plugins/admin/groups/class_groupApplication.inc:776
+#: plugins/admin/groups/class_groupApplication.inc:791
 msgid "Check parameter"
 msgstr "Controleer parameter"
 
-#: plugins/admin/groups/class_groupApplication.inc:778
+#: plugins/admin/groups/class_groupApplication.inc:793
 msgid "This application has changed parameters."
 msgstr "Dit programma heeft veranderde parameters."
 
-#: plugins/admin/groups/class_groupApplication.inc:871
+#: plugins/admin/groups/class_groupApplication.inc:914
 #, fuzzy, php-format
 msgid "Removing of groups/applications with dn '%s' failed."
 msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
 
-#: plugins/admin/groups/class_groupApplication.inc:916
+#: plugins/admin/groups/class_groupApplication.inc:967
 #, fuzzy, php-format
 msgid "Saving of groups/applications with dn '%s' failed."
 msgstr "Het opslaan van het programma is mislukt"
 
-#: plugins/admin/groups/class_groupApplication.inc:960
+#: plugins/admin/groups/class_groupApplication.inc:1018
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -6601,15 +6818,21 @@ msgstr ""
 "Kon distributienaam '%s' moet vinden. Distributienaam is ingesteld op '%s'. "
 "De basis van het object is mogelijk gewijzigd."
 
-#: plugins/admin/groups/class_groupApplication.inc:1103
+#: plugins/admin/groups/class_groupApplication.inc:1023
+msgid ""
+"There are no releases available. You will not be able to select another "
+"release."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1164
 #, fuzzy
 msgid "Group applications"
 msgstr "Toon programma's"
 
-#: plugins/admin/groups/class_groupApplication.inc:1110
+#: plugins/admin/groups/class_groupApplication.inc:1171
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:144
+#: plugins/admin/applications/class_divListApplication.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
 #: plugins/gofon/fonreports/contents.tpl:34
@@ -6617,19 +6840,19 @@ msgstr "Toon programma's"
 msgid "Application"
 msgstr "Programma"
 
-#: plugins/admin/groups/class_groupApplication.inc:1111
+#: plugins/admin/groups/class_groupApplication.inc:1172
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:87
 #: plugins/admin/systems/servRepositorySetup.tpl:19
 #: plugins/admin/systems/class_servRepository.inc:238
-#: plugins/admin/fai/faiPackage.tpl:33
-#: plugins/admin/fai/class_faiPackage.inc:560
+#: plugins/admin/fai/faiPackage.tpl:37
+#: plugins/admin/fai/class_faiPackage.inc:542
 #: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Distributie versie"
 
-#: plugins/admin/groups/class_groupApplication.inc:1112
+#: plugins/admin/groups/class_groupApplication.inc:1173
 #, fuzzy
 msgid "Application parameter"
 msgstr "Programmanaam"
@@ -6660,7 +6883,7 @@ msgstr "Groepsnaam / Afdeling"
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/admin/fai/faiScriptEntry.tpl:33
-#: plugins/gofon/conference/generic.tpl:4
+#: plugins/gofon/conference/generic.tpl:5
 msgid "Properties"
 msgstr "Eigenschappen"
 
@@ -6711,58 +6934,57 @@ msgid "Create new group"
 msgstr "Nieuwe groep aanmaken"
 
 #: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:187
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:199
+#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/applications/class_divListApplication.inc:188
 #: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "cut"
 msgstr "knippen"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:199
+#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/applications/class_divListApplication.inc:188
 #: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: plugins/admin/groups/class_divListGroup.inc:201
+#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/applications/class_divListApplication.inc:195
 #: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "copy"
 msgstr "kopieer"
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: plugins/admin/groups/class_divListGroup.inc:201
+#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/applications/class_divListApplication.inc:195
 #: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: plugins/admin/groups/class_divListGroup.inc:206
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/departments/class_divListDepartment.inc:133
 #: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
+#: plugins/gofon/conference/class_divListConferences.inc:159
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:138
 #: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
+#: plugins/gofon/conference/class_divListConferences.inc:169
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
@@ -6794,34 +7016,34 @@ msgstr ""
 "veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord "
 "a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/users/class_userManagement.inc:273
+#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:272
 msgid "You are not allowed to set this users password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van deze gebruiker veranderen!"
 
-#: plugins/admin/users/class_userManagement.inc:309
+#: plugins/admin/users/class_userManagement.inc:307
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "U staat op het punt gebruiker %s te verwijderen."
 
-#: plugins/admin/users/class_userManagement.inc:340
+#: plugins/admin/users/class_userManagement.inc:337
 msgid "You are not allowed to delete this user!"
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/admin/users/class_userManagement.inc:448
+#: plugins/admin/users/class_userManagement.inc:444
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:282
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:463
 #, fuzzy
 msgid "Please select a valid template."
 msgstr "Selecteer a.u.b. een geldig bestand."
 
-#: plugins/admin/users/class_userManagement.inc:560
+#: plugins/admin/users/class_userManagement.inc:556
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Er bestaat al een persoon met deze naam in deze tree."
 
@@ -6840,12 +7062,12 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:798
-#: plugins/admin/fai/class_faiTemplate.inc:451
+#: plugins/admin/systems/class_systemManagement.inc:812
+#: plugins/admin/fai/class_faiTemplate.inc:486
 msgid "Template"
 msgstr "Sjabloon"
 
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+#: plugins/admin/users/main.inc:42 plugins/admin/users/main.inc:48
 msgid "User administration"
 msgstr "Gebruikersbeheer"
 
@@ -6920,85 +7142,85 @@ msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
 msgid "Show proxy users"
 msgstr "Toon Proxy gebruikers"
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "Create new user"
 msgstr "Maak nieuwe gebruiker aan"
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "New user"
 msgstr "Nieuwe gebruiker"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "Create new template"
 msgstr "Maak nieuw sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "New template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:185
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/users/class_divListUsers.inc:186
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Edit UNIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:192
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:194
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:196
 msgid "Edit fax properies"
 msgstr "Bewerk Fax eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:198
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:200
 msgid "Edit netatalk properties"
 msgstr "Bewerk Netatalk eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/users/class_divListUsers.inc:201
 msgid "Create user from template"
 msgstr "Maak gebruiker aan vanuit sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:202
 msgid "Create user with this template"
 msgstr "Maak gebruiker aan met dit sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:254
+#: plugins/admin/users/class_divListUsers.inc:260
 msgid "password"
 msgstr "wachtwoord"
 
-#: plugins/admin/users/class_divListUsers.inc:258
+#: plugins/admin/users/class_divListUsers.inc:264
 #, fuzzy
 msgid "You are not allowed to change the password for this user."
 msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
 
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:278
 #, fuzzy
 msgid "You are not allowed to remove this user."
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/admin/users/class_divListUsers.inc:289
+#: plugins/admin/users/class_divListUsers.inc:297
 msgid "Online"
 msgstr "Online"
 
-#: plugins/admin/users/class_divListUsers.inc:296
+#: plugins/admin/users/class_divListUsers.inc:304
 msgid "Offline"
 msgstr "Offline"
 
@@ -7010,9 +7232,9 @@ msgid "Application name"
 msgstr "Programmanaam"
 
 #: plugins/admin/applications/generic.tpl:15
-#: plugins/gofon/macro/generic.tpl:10
-#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:14
+#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Display name"
 msgstr "Getoonde naam"
 
@@ -7028,7 +7250,7 @@ msgstr "Te tonen programma naam (bv. onder iconen)"
 #: plugins/admin/systems/goMailServer.tpl:215
 #: plugins/admin/systems/goImapServer.tpl:110
 #: plugins/admin/ogroups/termgroup.tpl:101
-#: plugins/admin/fai/faiTemplateEntry.tpl:89
+#: plugins/admin/fai/faiTemplateEntry.tpl:105
 msgid "Execute"
 msgstr "Commando"
 
@@ -7085,15 +7307,15 @@ msgstr "Plaats invoer in snelstartbalk van groepsleden"
 #: plugins/admin/applications/generic.tpl:135
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
-#: plugins/admin/fai/faiTemplateEntry.tpl:40
+#: plugins/admin/fai/faiTemplateEntry.tpl:49
 msgid "Upload"
 msgstr "Uploaden"
 
 #: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:288
-#: plugins/admin/fai/class_faiTemplate.inc:252
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:271
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:273
+#: plugins/admin/fai/class_faiHook.inc:308
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Downloaden"
@@ -7120,12 +7342,12 @@ msgstr ""
 "knop hieronder te gebruiken."
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/admin/fai/class_faiVariable.inc:384
+#: plugins/admin/fai/class_faiVariable.inc:412
 msgid "Variable"
 msgstr "Variabele"
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/gofon/macro/parameter.tpl:9
+#: plugins/gofon/macro/parameter.tpl:10
 msgid "Default value"
 msgstr "Standaard waarde"
 
@@ -7278,13 +7500,13 @@ msgstr ""
 "bewerken of verwijderen. Indien u veel programma's heeft is het aan te raden "
 "de selectie mogelijkheden te gebruiken."
 
-#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/applications/class_divListApplication.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:122
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
 msgid "new"
 msgstr "nieuw"
 
-#: plugins/admin/applications/class_divListApplication.inc:113
+#: plugins/admin/applications/class_divListApplication.inc:129
 msgid "Create new application"
 msgstr "Nieuw programma aanmaken"
 
@@ -7309,7 +7531,7 @@ msgid "Name of subtree to create"
 msgstr "Naam van de aan te maken subtree"
 
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:84
 msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
@@ -7323,7 +7545,7 @@ msgid "Category for this subtree"
 msgstr "Categorie voor deze subtree"
 
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:168
 msgid "Choose subtree to place department in"
 msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
 
@@ -7469,7 +7691,7 @@ msgstr "Verplaatsen van %s naar %s"
 #: include/class_ldap.inc:458 include/class_acl.inc:523
 #: include/class_acl.inc:530 include/class_acl.inc:537
 #: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:54
+#: ihtml/themes/default/snapshotdialog.tpl:53
 msgid "Object"
 msgstr "Object"
 
@@ -7501,13 +7723,13 @@ msgid "Department name"
 msgstr "Afdelingnaam"
 
 #: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen."
 
 #: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
 msgid "You have no permission to remove this department."
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
@@ -7535,12 +7757,12 @@ msgstr ""
 msgid "Regular expression for matching department names"
 msgstr "Reguliere expressie voor overeenkomende afdelingen"
 
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/fai/class_divListFai.inc:124
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/fai/class_divListFai.inc:139
 msgid "Go to users home department"
 msgstr "Ga naar de afdeling van de gebruiker"
 
-#: plugins/admin/departments/class_divListDepartment.inc:84
+#: plugins/admin/departments/class_divListDepartment.inc:101
 msgid "Create new department"
 msgstr "Nieuwe afdeling aanmaken"
 
@@ -7579,7 +7801,7 @@ msgstr "Zone"
 #: plugins/admin/systems/network.tpl:77
 #: plugins/admin/systems/class_servDNS.inc:168
 #: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:543
+#: plugins/admin/systems/class_termDNS.inc:542
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7597,7 +7819,7 @@ msgstr "aanwezig"
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:161
 #: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:470
+#: plugins/admin/systems/class_workstationStartup.inc:471
 msgid "This 'dn' has no terminal features."
 msgstr "Deze 'dn' heeft geen terminal mogelijkheden."
 
@@ -7802,7 +8024,7 @@ msgstr "Terminal naam"
 
 #: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
 #: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:505
+#: plugins/admin/systems/class_terminalGeneric.inc:508
 #: plugins/admin/systems/phonesettings.tpl:25
 #: plugins/admin/ogroups/termgroup.tpl:47
 #: plugins/admin/ogroups/class_termgroup.inc:389
@@ -7830,7 +8052,7 @@ msgid "Choose server to use for logging"
 msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
 
 #: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:506
+#: plugins/admin/systems/class_terminalGeneric.inc:509
 msgid "Root server"
 msgstr "Root server"
 
@@ -7839,7 +8061,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
 #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:507
+#: plugins/admin/systems/class_terminalGeneric.inc:510
 msgid "Swap server"
 msgstr "Swap server"
 
@@ -7904,10 +8126,10 @@ msgstr "onbekend"
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/admin/systems/class_terminalGeneric.inc:298
 #: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:783
+#: plugins/admin/systems/class_workstationStartup.inc:268
+#: plugins/admin/systems/class_workstationStartup.inc:285
+#: plugins/admin/systems/class_workstationStartup.inc:289
+#: plugins/admin/systems/class_workstationStartup.inc:790
 #: plugins/admin/systems/class_workstationService.inc:201
 #: plugins/admin/systems/class_workstationService.inc:204
 #: plugins/admin/systems/class_workstationService.inc:207
@@ -8124,7 +8346,7 @@ msgid "Telephone hardware"
 msgstr "Telefoon hardware"
 
 #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:310
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8144,31 +8366,31 @@ msgid "Terminal startup"
 msgstr "Terminal sjabloon"
 
 #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1109
+#: plugins/admin/systems/class_workstationStartup.inc:1118
 #, fuzzy
 msgid "Ldap server"
 msgstr "Ldap server"
 
 #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1113
+#: plugins/admin/systems/class_workstationStartup.inc:1122
 #, fuzzy
 msgid "Kernel modules"
 msgstr "Controleer parameter"
 
 #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1119
 #: plugins/admin/systems/workstationStartup.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:8
 msgid "Boot kernel"
 msgstr "Boot kernel"
 
 #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1111
+#: plugins/admin/systems/class_workstationStartup.inc:1120
 #, fuzzy
 msgid "Kernel parameter"
 msgstr "Controleer parameter"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:185
 msgid "Server name"
 msgstr "Servernaam"
 
@@ -8388,35 +8610,35 @@ msgstr ""
 "Er moet tenminste een NTP server geselecteerd zijn of de overervings mode "
 "moet geactiveerd zijn."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:485
+#: plugins/admin/systems/class_terminalGeneric.inc:488
 #, php-format
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:496
-#: plugins/admin/systems/class_terminalGeneric.inc:502
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#: plugins/admin/systems/class_terminalGeneric.inc:505
+#: plugins/admin/systems/class_systemManagement.inc:813
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:385
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:497
+#: plugins/admin/systems/class_terminalGeneric.inc:500
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Service"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:508
+#: plugins/admin/systems/class_terminalGeneric.inc:511
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Syslog server"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:509
+#: plugins/admin/systems/class_terminalGeneric.inc:512
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Gebruikersinstellingen"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:515
 #: plugins/admin/systems/class_servGeneric.inc:347
 #: plugins/admin/systems/class_workstationGeneric.inc:519
 #: plugins/admin/ogroups/class_termgroup.inc:391
@@ -8564,7 +8786,7 @@ msgid "Workstation generic"
 msgstr "Werkstation naam"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_systemManagement.inc:814
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:384
 #: plugins/generic/references/class_reference.inc:48
@@ -8581,98 +8803,98 @@ msgstr "NTP tijdserver"
 msgid "Systems"
 msgstr "Systemen"
 
-#: plugins/admin/systems/class_systemManagement.inc:208
+#: plugins/admin/systems/class_systemManagement.inc:222
 msgid "You can't edit this object type yet!"
 msgstr "U kunt dit object type nog niet bewerken!"
 
-#: plugins/admin/systems/class_systemManagement.inc:233
+#: plugins/admin/systems/class_systemManagement.inc:247
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:250
+#: plugins/admin/systems/class_systemManagement.inc:264
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:304
+#: plugins/admin/systems/class_systemManagement.inc:318
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "U staat op het punt alle informatie over dit component op '%s' te "
 "verwijderen."
 
-#: plugins/admin/systems/class_systemManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:371
+#: plugins/admin/systems/class_systemManagement.inc:324
+#: plugins/admin/systems/class_systemManagement.inc:385
 #: plugins/admin/fai/class_faiManagement.inc:168
 #: plugins/admin/fai/class_faiManagement.inc:221
 msgid "You are not allowed to delete this component!"
 msgstr "U heeft geen toestemming om dit component te verwijderen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:638
+#: plugins/admin/systems/class_systemManagement.inc:652
 msgid "New terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:640
+#: plugins/admin/systems/class_systemManagement.inc:654
 msgid "New workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:656
 msgid "New Device"
 msgstr "Nieuw apparaat"
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:675
 msgid "Terminal template for"
 msgstr "Terminal sjabloon voor"
 
-#: plugins/admin/systems/class_systemManagement.inc:677
+#: plugins/admin/systems/class_systemManagement.inc:691
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
-#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_systemManagement.inc:811
 msgid "New System from incoming"
 msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_systemManagement.inc:815
 msgid "Workstation is installing"
 msgstr "Werkstation wordt momenteel geinstalleerd"
 
-#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_systemManagement.inc:816
 msgid "Workstation is waiting for action"
 msgstr "Werkstation wacht op gebruikersactie"
 
-#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_systemManagement.inc:817
 msgid "Workstation installation failed"
 msgstr "Werkstation installatie mislukt"
 
-#: plugins/admin/systems/class_systemManagement.inc:806
+#: plugins/admin/systems/class_systemManagement.inc:820
 msgid "Server is installing"
 msgstr "Server wordt momenteel geinstalleerd"
 
-#: plugins/admin/systems/class_systemManagement.inc:807
+#: plugins/admin/systems/class_systemManagement.inc:821
 msgid "Server is waiting for action"
 msgstr "Server wacht op gebruikersactie"
 
-#: plugins/admin/systems/class_systemManagement.inc:808
+#: plugins/admin/systems/class_systemManagement.inc:822
 msgid "Server installation failed"
 msgstr "Server installatie mislukt"
 
-#: plugins/admin/systems/class_systemManagement.inc:809
+#: plugins/admin/systems/class_systemManagement.inc:823
 msgid "Winstation"
 msgstr "Windows werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:810
+#: plugins/admin/systems/class_systemManagement.inc:824
 msgid "Network Device"
 msgstr "Netwerk apparaat"
 
-#: plugins/admin/systems/class_systemManagement.inc:811
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_systemManagement.inc:825
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:826
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation"
 msgstr "Nieuw werkstation"
 
@@ -8820,7 +9042,7 @@ msgid "Reverse zone"
 msgstr "Reverse zone"
 
 #: plugins/admin/systems/class_servDNS.inc:169
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/fai/faiTemplateEntry.tpl:102
 msgid "Class"
 msgstr "Klasse"
 
@@ -8854,7 +9076,7 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_termDNS.inc:541
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zone-naam"
@@ -8907,7 +9129,7 @@ msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
 #: plugins/admin/systems/class_goFaxServer.inc:67
 #: plugins/admin/systems/class_goFonServer.inc:70
-#, fuzzy, php-format
+#, fuzzy
 msgid "The attribute password is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
@@ -9182,8 +9404,8 @@ msgstr ""
 #: plugins/admin/systems/class_printGeneric.inc:837
 #: plugins/admin/systems/class_printGeneric.inc:839
 #: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/admin/fai/faiTemplateEntry.tpl:85
+#: plugins/admin/fai/faiTemplateEntry.tpl:127
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Groep"
@@ -9410,12 +9632,12 @@ msgid "This 'dn' has no phone features."
 msgstr "Deze 'dn' heeft geen telefoon mogelijkheden."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "yes"
 msgstr "ja"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 msgid "no"
 msgstr "nee"
 
@@ -9568,7 +9790,7 @@ msgstr "Het pad bevat ongeldige karakters."
 msgid "Option contains invalid characters."
 msgstr "De optie bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_workstationStartup.inc:401
+#: plugins/admin/systems/class_workstationStartup.inc:402
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9576,11 +9798,11 @@ msgstr ""
 "Er bestaan pakketten in uw configuratie, die niet gekoppeld kunnen worden "
 "aan de huidige server/distributie instellingen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:446
+#: plugins/admin/systems/class_workstationStartup.inc:447
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Selecteer a.u.b. een 'FAI server' of  verwijder de 'FAI klasses'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:508
+#: plugins/admin/systems/class_workstationStartup.inc:509
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9588,7 +9810,11 @@ msgstr ""
 "Er bestaat al een profiel in uw selectie die partitietabel configuraties "
 "bevat."
 
-#: plugins/admin/systems/class_workstationStartup.inc:856
+#: plugins/admin/systems/class_workstationStartup.inc:721
+msgid "Not available in current setup"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:863
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9597,25 +9823,24 @@ msgstr ""
 "Kon een of meer van de opgegeven FAI klasse(n) [%s] niet vinden op de FAI "
 "server '%s'. De server is teruggezet op 'auto'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:870
-#, php-format
+#: plugins/admin/systems/class_workstationStartup.inc:879
+#, fuzzy, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"configurations, possibly some classes where deleted or renamed. Server was "
+"reset to 'auto'."
 msgstr ""
 "Kan de opgegeven FAI klasse(n) [%s] sowieso niet vinden. Controleer uw FAI "
 "configuratie a.u.b. Het is mogelijk dat sommige klassen verwijderd of "
 "hernoemd zijn. Alle klassen zijn verwijderd van dit account. Druk op "
 "annuleren indien u deze wijzigingen niet wenst op te slaan."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1031
+#: plugins/admin/systems/class_workstationStartup.inc:1040
 #, fuzzy, php-format
 msgid "Saving of system workstation/startup with dn '%s' failed."
 msgstr "Het opslaan van de werkstation opstart instellingen is mislukt"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1081
+#: plugins/admin/systems/class_workstationStartup.inc:1090
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
@@ -9623,7 +9848,7 @@ msgstr ""
 "Kan de opgegeven REPOSITORY_HOOK '%s' niet uitvoeren. Controleer uw gosa."
 "conf a.u.b."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1083
+#: plugins/admin/systems/class_workstationStartup.inc:1092
 #: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
@@ -9633,27 +9858,27 @@ msgstr ""
 "De in uw 'gosa.conf' opgegeven REPOSITORY_HOOK '%s' geeft een lege waarde "
 "terug."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1101
+#: plugins/admin/systems/class_workstationStartup.inc:1110
 #, fuzzy
 msgid "System startup"
 msgstr "Systeem status"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1116
-#: plugins/admin/fai/class_faiProfile.inc:447
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/fai/class_faiProfile.inc:453
+#: plugins/admin/fai/faiProfile.tpl:36
 msgid "FAI classes"
 msgstr "FAI klassen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1117
+#: plugins/admin/systems/class_workstationStartup.inc:1126
 msgid "Debian mirror"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1127
 #, fuzzy
 msgid "Debian release"
 msgstr "Huidige uitgave"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1129
 msgid "FAI status flag"
 msgstr ""
 
@@ -9820,18 +10045,20 @@ msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr "Het ge-uploade ppd bestand is leeg. Kan geen nieuw ppd bestand maken."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/fai/class_faiPackage.inc:558
+#: plugins/admin/fai/faiPackage.tpl:45
+#: plugins/admin/fai/class_faiPackage.inc:539
 msgid "Section"
 msgstr "Sectie"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:462
 #: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
 msgid "True"
 msgstr "Ja"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:463
 #: plugins/admin/systems/class_printerPPDDialog.inc:466
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
 msgid "False"
 msgstr "Nee"
 
@@ -9873,7 +10100,7 @@ msgstr "Selecteer de toe te voegen objecten"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:45
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
@@ -9882,7 +10109,7 @@ msgstr "Toon overeenkomende objecten"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:52
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/ogroups/ogroup_objects.tpl:46
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
@@ -10152,7 +10379,7 @@ msgstr "Selecteer de te gebruiken scanner driver"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/systems/class_servRepository.inc:349
-#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/fai/faiPackage.tpl:33
 msgid "Repository"
 msgstr "Verzamelplaats"
 
@@ -10497,7 +10724,7 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
 msgid "File"
 msgstr "Bestand"
 
@@ -10654,7 +10881,7 @@ msgid "Add/Edit network interface"
 msgstr "Netwerkkaart toevoegen/bewerken"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:533
+#: plugins/admin/systems/class_termDNS.inc:532
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
@@ -10736,7 +10963,7 @@ msgid "New processor"
 msgstr "Nieuwe processor"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "P"
 msgstr "PR"
 
@@ -10844,8 +11071,8 @@ msgstr "Website"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
 #: plugins/admin/ogroups/class_mailogroup.inc:146
 #: plugins/admin/ogroups/class_phonequeue.inc:701
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/conference/generic.tpl:100 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
@@ -11056,11 +11283,11 @@ msgstr "Het vereiste veld 'IP adres' is leeg."
 msgid "Wrong IP format in field IP-address."
 msgstr "Verkeerd IP formaat in het veld IP adres"
 
-#: plugins/admin/systems/class_termDNS.inc:325
+#: plugins/admin/systems/class_termDNS.inc:324
 msgid "The required field 'MAC-address' is not set."
 msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
 
-#: plugins/admin/systems/class_termDNS.inc:332
+#: plugins/admin/systems/class_termDNS.inc:331
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -11068,17 +11295,17 @@ msgstr ""
 "Het opgegeven mac-adres is ongeldig. Deze moet bestaan uit 6 segmenten van 2 "
 "bytes, gescheiden door ':'"
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_termDNS.inc:351
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_termDNS.inc:359
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr "Meer dan een regel gevonden voor uniek record type '%s'."
 
-#: plugins/admin/systems/class_termDNS.inc:371
+#: plugins/admin/systems/class_termDNS.inc:370
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -11087,32 +11314,32 @@ msgstr ""
 "Het apparaat IP '%s' is toegevoegd als 'A Record'. Dit wordt automatisch "
 "afgehandeld door GOsa. Verwijder het record a.u.b."
 
-#: plugins/admin/systems/class_termDNS.inc:378
+#: plugins/admin/systems/class_termDNS.inc:377
 #: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:460
 #, fuzzy, php-format
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Het opslaan van het E-mail account is mislukt"
 
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:522
 msgid "DNS"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:524
+#: plugins/admin/systems/class_termDNS.inc:523
 #, fuzzy
 msgid "DNS settings"
 msgstr "Samba Instellingen"
 
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:531
 #, fuzzy
 msgid "IP address"
 msgstr "IP adres"
 
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_termDNS.inc:540
 #, fuzzy
 msgid "DNS records"
 msgstr "DNS records"
@@ -11219,7 +11446,7 @@ msgstr "Selecteer een objectgroep"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
 msgid "Down"
 msgstr "Omlaag"
 
@@ -11465,88 +11692,98 @@ msgstr "Toon netwerk apparaten"
 msgid "Display systems of user"
 msgstr "Toon systemen van gebruiker"
 
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal template"
 msgstr "Nieuw terminal sjabloon"
 
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation template"
 msgstr "Nieuw werkstation sjabloon"
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:141
 msgid "New Server"
 msgstr "Nieuwe server"
 
-#: plugins/admin/systems/class_divListSystem.inc:112
-#: plugins/admin/systems/class_divListSystem.inc:113
+#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "New Printer"
 msgstr "Nieuwe printer"
 
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/class_divListSystem.inc:115
+#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "New Phone"
 msgstr "Nieuwe telefoon"
 
-#: plugins/admin/systems/class_divListSystem.inc:116
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/systems/class_divListSystem.inc:146
+#: plugins/admin/systems/class_divListSystem.inc:147
 msgid "New Component"
 msgstr "Nieuw component"
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:165
 msgid "Cups Server"
 msgstr "Cups server"
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:166
 msgid "Log Db"
 msgstr "Log DB"
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:167
 msgid "Syslog Server"
 msgstr "Syslog server"
 
-#: plugins/admin/systems/class_divListSystem.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:168
 msgid "Mail Server"
 msgstr "Mail server"
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:169
 msgid "Imap Server"
 msgstr "Imap server"
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:170
 msgid "Nfs Server"
 msgstr "Nfs server"
 
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:171
 msgid "Kerberos Server"
 msgstr "Kerberos server"
 
-#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:172
 msgid "Asterisk Server"
 msgstr "Asterisk server"
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:173
 msgid "Fax Server"
 msgstr "Fax server"
 
-#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:174
 msgid "Ldap Server"
 msgstr "Ldap server"
 
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/acl/class_divListACL.inc:123
 msgid "Edit system"
 msgstr "Bewerk systeem"
 
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: plugins/admin/systems/class_divListSystem.inc:192
 #: plugins/admin/acl/class_divListACL.inc:126
 msgid "Delete system"
 msgstr "Verwijder systeem"
 
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 msgid "Set root       password"
 msgstr "Stel root    wachtwoord in"
 
+#: plugins/admin/systems/class_divListSystem.inc:229
+#, fuzzy
+msgid "Create CD"
+msgstr "Aanmaken"
+
+#: plugins/admin/systems/class_divListSystem.inc:230
+#, fuzzy
+msgid "Create FAI CD"
+msgstr "Nieuw FAI object aanmaken"
+
 #: plugins/admin/systems/ServiceAddDialog.tpl:3
 msgid "Adding a new service to the current server"
 msgstr ""
@@ -11928,18 +12165,18 @@ msgid "VoIP service - Asterisk management"
 msgstr "Asterisk beheer"
 
 #: plugins/admin/systems/class_goFonServer.inc:67
-#, fuzzy, php-format
+#, fuzzy
 msgid "The attribute DB user is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
 #: plugins/admin/systems/class_goFonServer.inc:73
-#, fuzzy, php-format
+#, fuzzy
 msgid ""
 "The attribute local dial prefix is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
 #: plugins/admin/systems/class_goFonServer.inc:76
-#, fuzzy, php-format
+#, fuzzy
 msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
@@ -12124,6 +12361,51 @@ msgstr "IMAP Service"
 msgid "Admin password"
 msgstr "Beheerders wachtwoord"
 
+#: plugins/admin/systems/class_goShareServer.inc:32
+#, fuzzy
+msgid "File service"
+msgstr "Bestandserver"
+
+#: plugins/admin/systems/class_goShareServer.inc:153
+#: plugins/admin/systems/class_goShareServer.inc:343
+#, fuzzy
+msgid "File service (Shares)"
+msgstr "Bestandserver"
+
+#: plugins/admin/systems/class_goShareServer.inc:187
+#, fuzzy, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr "Het opslaan van de server db instellingen is mislukt"
+
+#: plugins/admin/systems/class_goShareServer.inc:238
+#, fuzzy, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr "Het aanmaken van een mount container is mislukt"
+
+#: plugins/admin/systems/class_goShareServer.inc:252
+#, fuzzy, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr "Het verwijderen van een mount container is mislukt"
+
+#: plugins/admin/systems/class_goShareServer.inc:263
+#, fuzzy, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr "Het opslaan van de mount container is mislukt"
+
+#: plugins/admin/systems/class_goShareServer.inc:344
+#, fuzzy
+msgid "File service - Shares"
+msgstr "Bestandserver"
+
+#: plugins/admin/systems/class_goShareServer.inc:353
+msgid "Apple mounts"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:356
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/goLogDBServer.tpl:1
 #, fuzzy
 msgid "Logging database information"
@@ -12365,65 +12647,20 @@ msgstr "Het opslaan van de printer is mislukt"
 #: plugins/admin/systems/class_goService.inc:116
 #, fuzzy, php-format
 msgid "Saving of server services/"
-msgstr "Sieve service"
-
-#: plugins/admin/systems/class_goService.inc:147
-#, fuzzy, php-format
-msgid "Set status flag for server services/"
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goService.inc:204
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
-"bestaat niet."
-
-#: plugins/admin/systems/class_goShareServer.inc:32
-#, fuzzy
-msgid "File service"
-msgstr "Bestandserver"
-
-#: plugins/admin/systems/class_goShareServer.inc:153
-#: plugins/admin/systems/class_goShareServer.inc:343
-#, fuzzy
-msgid "File service (Shares)"
-msgstr "Bestandserver"
-
-#: plugins/admin/systems/class_goShareServer.inc:187
-#, fuzzy, php-format
-msgid "Saving of system server/shares with dn '%s' failed."
-msgstr "Het opslaan van de server db instellingen is mislukt"
-
-#: plugins/admin/systems/class_goShareServer.inc:238
-#, fuzzy, php-format
-msgid "Creating system server/shares (mount container) with dn '%s' failed."
-msgstr "Het aanmaken van een mount container is mislukt"
-
-#: plugins/admin/systems/class_goShareServer.inc:252
-#, fuzzy, php-format
-msgid "Removing system server/shares (mount container) with dn '%s' failed."
-msgstr "Het verwijderen van een mount container is mislukt"
-
-#: plugins/admin/systems/class_goShareServer.inc:263
-#, fuzzy, php-format
-msgid "Saving system server/shares (mount container) with dn '%s' failed."
-msgstr "Het opslaan van de mount container is mislukt"
+msgstr "Sieve service"
 
-#: plugins/admin/systems/class_goShareServer.inc:344
-#, fuzzy
-msgid "File service - Shares"
-msgstr "Bestandserver"
+#: plugins/admin/systems/class_goService.inc:147
+#, fuzzy, php-format
+msgid "Set status flag for server services/"
+msgstr "Het opslaan van het server service object is mislukt"
 
-#: plugins/admin/systems/class_goShareServer.inc:353
-msgid "Apple mounts"
+#: plugins/admin/systems/class_goService.inc:204
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
-
-#: plugins/admin/systems/class_goShareServer.inc:356
-#, fuzzy
-msgid "Charset"
-msgstr "Chipset"
+"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
+"bestaat niet."
 
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
@@ -12527,12 +12764,12 @@ msgstr "Toon printers"
 msgid "Select to see phones"
 msgstr "Selecteer om telefoons te zien"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects of department"
 msgstr "Toon objecten van afdeling"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:696
+#: plugins/admin/ogroups/class_ogroup.inc:711
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Objectgroepen"
@@ -12547,82 +12784,82 @@ msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
 msgid "You are not allowed to delete this object group!"
 msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:138
+#: plugins/admin/ogroups/class_ogroup.inc:146
 msgid "This 'dn' is no object group."
 msgstr "Deze 'dn' is geen objectgroep."
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "too many different objects!"
 msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
+#: plugins/admin/ogroups/class_ogroup.inc:294
 msgid "users"
 msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "groups"
 msgstr "groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "applications"
 msgstr "programma's"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "departments"
 msgstr "afdelingen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "servers"
 msgstr "servers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:291
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "workstations"
 msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:293
+#: plugins/admin/ogroups/class_ogroup.inc:301
 msgid "phones"
 msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:302
 msgid "printers"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:309
 msgid "and"
 msgstr "en"
 
-#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:462
 msgid "Non existing dn:"
 msgstr "Niet bestaande dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:589
+#: plugins/admin/ogroups/class_ogroup.inc:604
 msgid "There is already an object with this cn."
 msgstr "Er bestaat al een object met deze cn."
 
-#: plugins/admin/ogroups/class_ogroup.inc:603
+#: plugins/admin/ogroups/class_ogroup.inc:618
 msgid "You can combine two different object types at maximum only!"
 msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:652
+#: plugins/admin/ogroups/class_ogroup.inc:667
 #, fuzzy, php-format
 msgid "Saving of object group/generic with dn '%s' failed."
 msgstr "Het opslaan van de objectgroep is mislukt"
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
+#: plugins/admin/ogroups/class_ogroup.inc:680
 #, fuzzy, php-format
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Het verwijderen van de objectgroep is mislukt"
 
-#: plugins/admin/ogroups/class_ogroup.inc:691
+#: plugins/admin/ogroups/class_ogroup.inc:706
 #, fuzzy
 msgid "Object group generic"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_ogroup.inc:717
 #, fuzzy
 msgid "Member"
 msgstr "Groepsleden"
@@ -12874,7 +13111,7 @@ msgstr ""
 "niet opgeslagen worden."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12888,9 +13125,9 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:95
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-#: plugins/gofon/macro/class_gofonMacro.inc:247
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:245
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Kan de database %s op %s niet selecteren."
@@ -12906,8 +13143,8 @@ msgstr "Kan de database %s op Server %s niet verwijderen."
 #: plugins/admin/ogroups/class_phonequeue.inc:537
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
@@ -12921,8 +13158,8 @@ msgstr "Het opslaan van E-mail objectgroep instellingen is mislukt"
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:88
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1065
-#: plugins/gofon/macro/class_gofonMacro.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:234
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13168,19 +13405,19 @@ msgstr "Toon overeenkomende afdelingen"
 msgid "ACL management"
 msgstr "Blokkeerlijst beheer"
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiVariable.tpl:36
+#: plugins/admin/fai/faiPartitionTable.tpl:36
+#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:33
 #: plugins/admin/fai/faiHook.tpl:38
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
 msgid "Objects"
 msgstr "Objecten"
 
-#: plugins/admin/fai/faiVariable.tpl:34
+#: plugins/admin/fai/faiVariable.tpl:38
 msgid "List of assigned variables"
 msgstr "Lijst met toegekende variabelen"
 
-#: plugins/admin/fai/faiVariable.tpl:40
+#: plugins/admin/fai/faiVariable.tpl:44
 msgid "Choose a variable to delete or edit"
 msgstr "Kies een te bewerken of verwijderen variabele"
 
@@ -13188,54 +13425,35 @@ msgstr "Kies een te bewerken of verwijderen variabele"
 msgid "Fully Automatic Installation"
 msgstr "Fully Automatic Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:411
+#: plugins/admin/fai/class_faiScript.inc:422
 #, fuzzy, php-format
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Het aanmaken van de FAI script basis is mislukt"
 
-#: plugins/admin/fai/class_faiScript.inc:508
-#: plugins/admin/fai/class_faiHookEntry.inc:189
+#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiHookEntry.inc:191
 #, fuzzy
 msgid "FAI script"
 msgstr "Importeer script"
 
-#: plugins/admin/fai/class_faiScript.inc:515
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 #, fuzzy
 msgid "Readonly"
 msgstr "Lezen"
 
-#: plugins/admin/fai/class_faiTemplate.inc:366
+#: plugins/admin/fai/class_faiTemplate.inc:401
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Het opslaan van de FAI sjabloon basis is mislukt"
 
-#: plugins/admin/fai/class_faiTemplate.inc:452
+#: plugins/admin/fai/class_faiTemplate.inc:487
 #, fuzzy
 msgid "FAI template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/fai/class_faiTemplate.inc:461
-#, fuzzy
-msgid "Template file"
-msgstr "Sjabloon bundel"
-
-#: plugins/admin/fai/class_faiTemplate.inc:462
-#, fuzzy
-msgid "Template path"
-msgstr "Sjabloon naam"
-
-#: plugins/admin/fai/class_faiTemplate.inc:463
-#, fuzzy
-msgid "File owner"
-msgstr "Bestandsnaam"
-
-#: plugins/admin/fai/class_faiTemplate.inc:464
-#, fuzzy
-msgid "File permissions"
-msgstr "Rechten"
-
 #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:851
+#: plugins/admin/fai/class_faiManagement.inc:853
 msgid "FAI"
 msgstr "FAI"
 
@@ -13281,38 +13499,43 @@ msgid "You are not allowed to create a new branch."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
 #: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:520
+#: plugins/admin/fai/class_faiManagement.inc:522
 #, fuzzy, php-format
 msgid "You are not allowed to create a new '%s' object."
 msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
 
-#: plugins/admin/fai/class_faiManagement.inc:845
+#: plugins/admin/fai/class_faiManagement.inc:847
 #, fuzzy
 msgid "FAI releases"
 msgstr "FAI klassen"
 
-#: plugins/admin/fai/class_faiManagement.inc:846
+#: plugins/admin/fai/class_faiManagement.inc:848
 #, fuzzy
 msgid "FAI release management"
 msgstr "Blokkeerlijst beheer"
 
-#: plugins/admin/fai/faiPackage.tpl:49
+#: plugins/admin/fai/faiPackage.tpl:53
 msgid "Install method"
 msgstr "Installatie methode"
 
-#: plugins/admin/fai/faiPackage.tpl:65
+#: plugins/admin/fai/faiPackage.tpl:57
+#, fuzzy
+msgid "Please select the installation method"
+msgstr "Selecteer a.u.b. een geldig bestand."
+
+#: plugins/admin/fai/faiPackage.tpl:71
 msgid "Used packages"
 msgstr "Gebruikte pakketten"
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:73
 msgid "Choosen packages"
 msgstr "Gekozen pakketten"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
 msgid "Configure"
 msgstr "Instellen"
 
-#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/faiPackage.tpl:80
 msgid "Toggle remove flag"
 msgstr "Verwijder markering omschakelen"
 
@@ -13324,11 +13547,11 @@ msgstr ""
 "Dit omvat 'alle' object informatie. Verzeker uzelf hiervan, aangezien er "
 "geen manier is voor GOsa om deze gegevens terug te halen."
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
+#: plugins/admin/fai/faiPartitionTable.tpl:38
 msgid "Discs"
 msgstr "Schijven"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
+#: plugins/admin/fai/faiPartitionTable.tpl:44
 msgid "Choose a disk to delete or edit"
 msgstr "Kies een te bewerken of verwijderen hardeschijf"
 
@@ -13379,9 +13602,9 @@ msgid "Selected file is empty."
 msgstr "Het opgegeven bestand is leeg."
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:136
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:148
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiVariableEntry.inc:107
+#: plugins/admin/fai/class_faiHookEntry.inc:150
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a name."
 msgstr "Kies a.u.b. een naam."
 
@@ -13410,7 +13633,7 @@ msgstr "Inlogscript"
 msgid "Script attributes"
 msgstr "Script attributen"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:33
+#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:37
 msgid "Choose a priority"
 msgstr "Kies een prioriteit"
 
@@ -13419,186 +13642,193 @@ msgstr "Kies een prioriteit"
 msgid "Import script"
 msgstr "Importeer script"
 
-#: plugins/admin/fai/class_faiPackage.inc:399
+#: plugins/admin/fai/class_faiPackage.inc:380
 msgid "Please select a least one Package."
 msgstr "Selecteer a.u.b. tenminste een pakket."
 
-#: plugins/admin/fai/class_faiPackage.inc:403
+#: plugins/admin/fai/class_faiPackage.inc:384
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Kies a.u.b. een geldige combinatie voor uw verzamelplaats instellingen."
 
-#: plugins/admin/fai/class_faiPackage.inc:424
+#: plugins/admin/fai/class_faiPackage.inc:405
 msgid "package is configured"
 msgstr "pakket is geconfigureerd"
 
-#: plugins/admin/fai/class_faiPackage.inc:430
+#: plugins/admin/fai/class_faiPackage.inc:411
 msgid "Package marked for removal"
 msgstr "Pakket gemarkeerd voor verwijdering"
 
-#: plugins/admin/fai/class_faiPackage.inc:457
+#: plugins/admin/fai/class_faiPackage.inc:438
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Pakketbestand '%s' bestaat niet."
 
-#: plugins/admin/fai/class_faiPackage.inc:501
+#: plugins/admin/fai/class_faiPackage.inc:482
 #, fuzzy, php-format
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Het opslaan van de FAI pakket basis is mislukt"
 
-#: plugins/admin/fai/class_faiPackage.inc:547
+#: plugins/admin/fai/class_faiPackage.inc:528
 #: plugins/admin/fai/faiPackageConfiguration.tpl:1
 msgid "Package"
 msgstr "Pakket"
 
-#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiPackage.inc:529
 #, fuzzy
 msgid "FAI Package list"
 msgstr "Pakketlijst"
 
-#: plugins/admin/fai/class_faiPackage.inc:559
+#: plugins/admin/fai/class_faiPackage.inc:540
 #, fuzzy
 msgid "Install Method"
 msgstr "Installatie methode"
 
-#: plugins/admin/fai/class_faiProfile.inc:285
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "Package configuration"
+msgstr "FAX database"
+
+#: plugins/admin/fai/class_faiProfile.inc:290
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 msgid "This list displays all assigned class names for this profile."
 msgstr "Deze lijst toont alle toegekende klassenamen voor dit profiel."
 
-#: plugins/admin/fai/class_faiProfile.inc:288
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfileEntry.inc:135
 msgid "Hook bundle"
 msgstr "Inhakers bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfileEntry.inc:136
 msgid "Template bundle"
 msgstr "Sjabloon bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:290
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:137
 msgid "Script bundle"
 msgstr "Script bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:291
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfileEntry.inc:138
 msgid "Variable bundle"
 msgstr "Variabele bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:297
 msgid "Packages bundle"
 msgstr "Pakketbundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiPartitionTable.inc:490
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiProfile.inc:298
+#: plugins/admin/fai/class_faiPartitionTable.inc:520
+#: plugins/admin/fai/class_faiProfileEntry.inc:140
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Partition table"
 msgstr "Partitietabel"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:301
 msgid "Remove class from profile"
 msgstr "Verwijder klasse uit profiel"
 
-#: plugins/admin/fai/class_faiProfile.inc:386
+#: plugins/admin/fai/class_faiProfile.inc:392
 msgid "Please assign at least one class to this  profile."
 msgstr "Ken a.u.b. tenminste een klasse toe aan dit profiel."
 
-#: plugins/admin/fai/class_faiProfile.inc:390
+#: plugins/admin/fai/class_faiProfile.inc:396
 msgid "Please enter a valid name."
 msgstr "Geef a.u.b. een geldige naam op"
 
-#: plugins/admin/fai/class_faiProfile.inc:402
+#: plugins/admin/fai/class_faiProfile.inc:408
 msgid "There is already a profile with this class name defined."
 msgstr "Er bestaat al een profiel met deze klassenaam."
 
-#: plugins/admin/fai/class_faiProfile.inc:425
-#: plugins/admin/fai/class_faiProfile.inc:429
+#: plugins/admin/fai/class_faiProfile.inc:431
+#: plugins/admin/fai/class_faiProfile.inc:435
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Het opslaan van het FAI profiel is mislukt"
 
-#: plugins/admin/fai/class_faiProfile.inc:437
+#: plugins/admin/fai/class_faiProfile.inc:443
 #, fuzzy
 msgid "Profile"
 msgstr "Profielen"
 
-#: plugins/admin/fai/class_faiProfile.inc:438
+#: plugins/admin/fai/class_faiProfile.inc:444
 #, fuzzy
 msgid "FAI profile"
 msgstr "Nieuw profiel"
 
-#: plugins/admin/fai/class_faiHook.inc:402
+#: plugins/admin/fai/class_faiHook.inc:436
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Het opslaan van de FAI inhaker basis is mislukt"
 
-#: plugins/admin/fai/class_faiHook.inc:493
+#: plugins/admin/fai/class_faiHook.inc:527
 #, fuzzy
 msgid "Hook"
 msgstr "Inhakers"
 
-#: plugins/admin/fai/class_faiHook.inc:494
+#: plugins/admin/fai/class_faiHook.inc:528
 #, fuzzy
 msgid "FAI hook"
 msgstr "Toon FAI inhakers"
 
-#: plugins/admin/fai/class_faiHook.inc:501
+#: plugins/admin/fai/class_faiHook.inc:535
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiVariable.inc:420
 #, fuzzy
 msgid "Read only"
 msgstr "Lezen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "primary"
 msgstr "Primaire groep"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "logical"
 msgstr "Lokaal toevoegen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
 msgid "FS type"
 msgstr "FS type"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
 #: plugins/admin/fai/class_faiSummaryTab.inc:317
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
 #: plugins/admin/fai/class_faiSummaryTab.inc:316
 msgid "Size in MB"
 msgstr "Grootte in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#: plugins/admin/fai/class_faiPartitionTable.inc:504
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
 #: plugins/admin/fai/class_faiSummaryTab.inc:315
 msgid "Mount options"
 msgstr "Koppelopties"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 msgid "FS option"
 msgstr "FS opties"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "Preserve"
 msgstr "Bewaar"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr "Geef a.u.b. een uniek koppelpunt op voor partitie %s"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr "Geef a.u.b. een geldig koppelpunt op voor partitie %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -13607,30 +13837,30 @@ msgstr ""
 "Bestandssysteem type 'swap' wordt al gebruikt. Verander bestandssysteem type "
 "voor partitie %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 "Gebruik a.u.b. 'swap' als koppelpunt indien 'swap' gebruikt wordt als fs-"
 "type."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr "Geef a.u.b. een geldige partitie grootte op voor partitie %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr "Geef a.u.b. een geldig bereik op voor partitie %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr "Geef a.u.b. een bereik op voor de partitie grootte van partitie %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -13638,15 +13868,56 @@ msgstr ""
 "U heeft meer dan 3 primaire partitietabel regels in uw configuratie. "
 "Controleer uw configuratie a.u.b. nogmaals."
 
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#, fuzzy
+msgid "Partition table entry"
+msgstr "Partitietabel"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#, fuzzy
+msgid "FAI partition table entry"
+msgstr "Nieuwe partitietabel"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#, fuzzy
+msgid "Partition type"
+msgstr "Partitietabel"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#, fuzzy
+msgid "Partition no."
+msgstr "Partities"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#, fuzzy
+msgid "File system type"
+msgstr "Systeemtype"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#, fuzzy
+msgid "Partition size"
+msgstr "Partities"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#, fuzzy
+msgid "File system options"
+msgstr "systeem informatie bekijken"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partities"
+
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 msgid "Device"
 msgstr "Apparaat"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:24
 msgid "Partition entries"
 msgstr "Partitie regels"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:28
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 msgid "Add partition"
 msgstr "Partitie toevoegen"
 
@@ -13654,19 +13925,29 @@ msgstr "Partitie toevoegen"
 msgid "List of scripts"
 msgstr "Lijst met scripts"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
+#: plugins/admin/fai/class_faiVariableEntry.inc:103
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Geef a.u.b. een waarde op voor het atribuut 'inhoud'."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
-msgstr "Variabele attributen"
+#: plugins/admin/fai/class_faiVariableEntry.inc:134
+#, fuzzy
+msgid "Variable entry"
+msgstr "Variabele inhoud"
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-#: plugins/admin/fai/class_faiVariable.inc:394
+#: plugins/admin/fai/class_faiVariableEntry.inc:135
+#, fuzzy
+msgid "FAI variable entry "
+msgstr "Toon FAI variabelen"
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:144
+#: plugins/admin/fai/faiVariableEntry.tpl:38
 msgid "Variable content"
 msgstr "Variabele inhoud"
 
+#: plugins/admin/fai/faiVariableEntry.tpl:33
+msgid "Variable attributes"
+msgstr "Variabele attributen"
+
 #: plugins/admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "FAI objectlijst"
@@ -13680,7 +13961,7 @@ msgstr "Klasse herladen en configuratie van ouder object vrijgeven."
 msgid "You are not allowed to view the fai summary."
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/admin/fai/faiTemplate.tpl:31
+#: plugins/admin/fai/faiTemplate.tpl:35
 msgid "List of template files"
 msgstr "Lijst met sjabloonbestanden"
 
@@ -13688,82 +13969,52 @@ msgstr "Lijst met sjabloonbestanden"
 msgid "List of hook scripts"
 msgstr "Lijst met inhakers scripts"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:284
-#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#: plugins/admin/fai/class_faiPartitionTable.inc:313
+#: plugins/admin/fai/class_faiPartitionTable.inc:319
 #, php-format
 msgid "%s partition"
 msgstr "%s partitie"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:286
-#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#: plugins/admin/fai/class_faiPartitionTable.inc:315
+#: plugins/admin/fai/class_faiPartitionTable.inc:321
 #, php-format
 msgid "%s partition(s)"
 msgstr "%s partitie(s)"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:378
+#: plugins/admin/fai/class_faiPartitionTable.inc:408
 #, fuzzy, php-format
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Het opslaan van de FAI partitietabel basis is mislukt"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:491
+#: plugins/admin/fai/class_faiPartitionTable.inc:521
 #, fuzzy
 msgid "FAI partition table"
 msgstr "Nieuwe partitietabel"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:499
-#, fuzzy
-msgid "Partition type"
-msgstr "Partitietabel"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:500
-#, fuzzy
-msgid "Partition no."
-msgstr "Partities"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:501
-#, fuzzy
-msgid "File system type"
-msgstr "Systeemtype"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:503
-#, fuzzy
-msgid "Partition size"
-msgstr "Partities"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:505
-#, fuzzy
-msgid "File system options"
-msgstr "systeem informatie bekijken"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:506
-#, fuzzy
-msgid "Partition flags"
-msgstr "Partities"
-
-#: plugins/admin/fai/class_faiHookEntry.inc:144
+#: plugins/admin/fai/class_faiHookEntry.inc:146
 msgid "Please enter a value for script."
 msgstr "Geef a.u.b. een waarde voor script op"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:178
+#: plugins/admin/fai/class_faiHookEntry.inc:180
 #, fuzzy
 msgid "Hook entry"
 msgstr "Record verwijderen"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:179
+#: plugins/admin/fai/class_faiHookEntry.inc:181
 #, fuzzy
 msgid "FAI hook entry"
 msgstr "Toon FAI inhakers"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:188
+#: plugins/admin/fai/class_faiHookEntry.inc:190
 #: plugins/admin/fai/faiHookEntry.tpl:38
 msgid "Task"
 msgstr "Taak"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Package bundle"
 msgstr "Pakket bundel"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Klassenaam"
@@ -13856,96 +14107,126 @@ msgstr "Kies een klassenaam"
 msgid "A new class name."
 msgstr "Een nieuwe klassenaam."
 
-#: plugins/admin/fai/class_faiVariable.inc:306
+#: plugins/admin/fai/class_faiVariable.inc:334
 #, fuzzy, php-format
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Het opslaan van de FAI variabele basis is mislukt"
 
-#: plugins/admin/fai/class_faiVariable.inc:385
+#: plugins/admin/fai/class_faiVariable.inc:413
 #, fuzzy
 msgid "FAI variable"
 msgstr "Toon FAI variabelen"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_faiTemplateEntry.inc:95
 msgid "no file uploaded yet"
 msgstr "nog geen bestand ge-upload."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#: plugins/admin/fai/class_faiTemplateEntry.inc:101
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr "bestaat in database (grootte: %s bytes)"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'file'."
 msgstr "Geef a.u.b. een waarde op voor het atribuut 'bestand'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:188
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 msgid "Please specify a value for attribute 'path'."
 msgstr "Geef a.u.b. een waarde op voor het atribuut 'pad'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:196
+#: plugins/admin/fai/class_faiTemplateEntry.inc:200
 msgid "Please enter a user."
 msgstr "Geef a.u.b. een gebruiker op."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr "Geef a.u.b. een geldige gebruiker op! Alleen a-z/0-9 zijn toegestaan."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/fai/class_faiTemplateEntry.inc:207
 msgid "Please enter a group."
 msgstr "Geef a.u.b. een groep op."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/fai/class_faiTemplateEntry.inc:210
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "Geef a.u.b. een geldige groep op! Alleen a-z/0-9 zijn toegestaan."
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:21
+#: plugins/admin/fai/class_faiTemplateEntry.inc:239
+#, fuzzy
+msgid "Template entry"
+msgstr "Sjabloongebruiker"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:240
+#, fuzzy
+msgid "FAI template entry"
+msgstr "Nieuw sjabloon"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:249
+#, fuzzy
+msgid "Template file"
+msgstr "Sjabloon bundel"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:250
+#, fuzzy
+msgid "Template path"
+msgstr "Sjabloon naam"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:251
+#, fuzzy
+msgid "File owner"
+msgstr "Bestandsnaam"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:252
+#, fuzzy
+msgid "File permissions"
+msgstr "Rechten"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:25
 msgid "Template attributes"
 msgstr "Sjabloon atributen"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Save template"
 msgstr "Sjabloon opslaan"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#: plugins/admin/fai/faiTemplateEntry.tpl:57
 msgid "Destination path"
 msgstr "Doelpad"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/admin/fai/faiTemplateEntry.tpl:74
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:80
+#: plugins/admin/fai/faiTemplateEntry.tpl:96
 msgid "Access"
 msgstr "Toegang"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
 msgid "Read"
 msgstr "Lezen"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#: plugins/admin/fai/faiTemplateEntry.tpl:104
 msgid "Write"
 msgstr "Schrijven"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#: plugins/admin/fai/faiTemplateEntry.tpl:107
 msgid "Special"
 msgstr "Speciaal"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#: plugins/admin/fai/faiTemplateEntry.tpl:124
 msgid "SUID"
 msgstr "SUID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#: plugins/admin/fai/faiTemplateEntry.tpl:141
 msgid "SGID"
 msgstr "SGID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:112
+#: plugins/admin/fai/faiTemplateEntry.tpl:144
 msgid "Others"
 msgstr "Anderen"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:118
+#: plugins/admin/fai/faiTemplateEntry.tpl:158
 msgid "sticky"
 msgstr "sticky"
 
@@ -14199,72 +14480,72 @@ msgstr "Toon FAI partities"
 msgid "Show partitions"
 msgstr "Toon partities"
 
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "New profile"
 msgstr "Nieuw profiel"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "New partition table"
 msgstr "Nieuwe partitietabel"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "New scripts"
 msgstr "Nieuwe scripts"
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "S"
 msgstr "SC"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "New hooks"
 msgstr "Nieuwe inhakers"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "New variables"
 msgstr "Nieuwe variabelen"
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 #, fuzzy
 msgid "New templates "
 msgstr "Nieuwe sjablonen"
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 #, fuzzy
 msgid "I"
 msgstr "NI"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "New package list"
 msgstr "Nieuwe pakketlijst"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_divListFai.inc:227
-#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/fai/class_divListFai.inc:245
 msgid "Edit class"
 msgstr "Bewerk klasse"
 
-#: plugins/admin/fai/class_divListFai.inc:238
+#: plugins/admin/fai/class_divListFai.inc:253
 msgid "Delete class"
 msgstr "Verwijder klasse"
 
 #: plugins/admin/mimetypes/generic.tpl:13
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
 #, fuzzy
 msgid "Mime type"
 msgstr "MIME-type"
@@ -14457,7 +14738,7 @@ msgstr "MIME-type"
 msgid "Display mime types matching"
 msgstr "Toon de overeenkomende cartridgetypes"
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 #, fuzzy
 msgid "Create new mime type"
 msgstr "Maak nieuw sjabloon"
@@ -14492,8 +14773,8 @@ msgstr "niet gedefiniëerd"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:259
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:656
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
+#: plugins/gofon/macro/class_gofonMacro.inc:95
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -14599,7 +14880,7 @@ msgid "You need to specify at least one phone number!"
 msgstr "U dient tenminste één telefoonnummer op te geven!"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:943
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:342
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14635,7 +14916,7 @@ msgid "Phone account settings"
 msgstr "Telefoon instellingen"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
 #, fuzzy
 msgid "Telephone number"
 msgstr "Telefoonnummer"
@@ -14655,7 +14936,7 @@ msgstr "Telefoon"
 msgid "Voicemail pin"
 msgstr "Voicemail PIN-code"
 
-#: plugins/gofon/phoneaccount/main.inc:114
+#: plugins/gofon/phoneaccount/main.inc:123
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Telefoon instellingen"
@@ -14690,23 +14971,20 @@ msgstr "Toon overeenkomende macro's"
 msgid "Regular expression for matching macro names"
 msgstr "Reguliere expressie voor overeenkomende macronamen"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
+#: plugins/gofon/macro/class_gofonMacro.inc:483
 msgid "Macro name"
 msgstr "Macronaam"
 
-#: plugins/gofon/macro/generic.tpl:12
+#: plugins/gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Weer te geven macronaam"
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
-
-#: plugins/gofon/macro/generic.tpl:48
+#: plugins/gofon/macro/generic.tpl:60
 msgid "Visible for user"
 msgstr "Zichtbaar voor gebruikers"
 
-#: plugins/gofon/macro/generic.tpl:57
+#: plugins/gofon/macro/generic.tpl:70
 msgid "Macro text"
 msgstr "Macro tekst"
 
@@ -14714,22 +14992,22 @@ msgstr "Macro tekst"
 msgid "Phone macros"
 msgstr "Tel. macro's"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "U staat op het punt de macro '%s' te verwijderen."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
 msgid "You are not allowed to delete this macro!"
 msgstr "U heeft geen toestemming om deze macro te verwijderen!"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
+#: plugins/gofon/macro/class_gofonMacro.inc:101
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
 msgid "This 'dn' is no phone macro."
 msgstr "Deze 'dn' is geen telefoonmacro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:187
+#: plugins/gofon/macro/class_gofonMacro.inc:185
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -14737,14 +15015,14 @@ msgstr ""
 "Deze macro is nog steeds in gebruik. Verzeker uzelf ervan dat geen enkele "
 "gebruiker deze macro geselecteerd heeft."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:194
-#: plugins/gofon/macro/class_gofonMacro.inc:209
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:402
 #, fuzzy, php-format
 msgid "Removing of goFonMacro/generic account with dn '%s' failed."
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:222
+#: plugins/gofon/macro/class_gofonMacro.inc:220
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
@@ -14752,111 +15030,104 @@ msgstr ""
 "Kan geen veranderingen opslaan in de Asterisk database. Er is geen MySQL "
 "extensie beschikbaar. Controleer uw PHP installatie."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:292
+#: plugins/gofon/macro/class_gofonMacro.inc:290
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr "Kon de macro-inhoud op regel %s niet verwerken"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:308
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr "Kan SELECT zoekopdracht in DB '%s' niet uitvoeren"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:319
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:317
+#: plugins/gofon/macro/class_gofonMacro.inc:325
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr "Kan DELETE opdracht in DB '%s' niet uitvoeren"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:341
+#: plugins/gofon/macro/class_gofonMacro.inc:339
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr "Kan INSERT opdracht in DB '%s' niet uitvoeren"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:389
+#: plugins/gofon/macro/class_gofonMacro.inc:405
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "De opgegeven cn '%s' bestaat al."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:394
+#: plugins/gofon/macro/class_gofonMacro.inc:410
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "U moet de 'Display Naam' opgeven om deze macro op te slaan"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "De opgegeven cn is te lang om een Macro invoer te maken. Maximaal 20 "
 "karakters."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:403
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
-msgstr ""
-"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:409
+#: plugins/gofon/macro/class_gofonMacro.inc:418
 msgid "Makro length must be lower than 100 lines"
 msgstr "De macro lengte moet minder dan 100 regels zijn"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:423
 msgid "Please choose a valid  base."
 msgstr "Geef a.u.b. een geldige basis op."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:466
 #, fuzzy, php-format
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:475
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Asterisk beheer"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:477
+#: plugins/gofon/macro/class_gofonMacro.inc:487
 #, fuzzy
 msgid "Macro content"
 msgstr "Macro tekst"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:478
+#: plugins/gofon/macro/class_gofonMacro.inc:488
 msgid "Visibility flag"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/parameter.tpl:4
 msgid "Argument"
 msgstr "Argument"
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/parameter.tpl:8
 msgid "type"
 msgstr "type"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
+#: plugins/gofon/macro/parameter.tpl:19
+#, fuzzy
+msgid "You are not allowed to view the marco parameter settings"
+msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:258
 msgid "String"
 msgstr "Tekstregel"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:259
 msgid "Combobox"
 msgstr "Combobox"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:260
 msgid "Bool"
 msgstr "Bool"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:266
 msgid "Delete unused"
 msgstr "Verwijder ongebruikte"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:347
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr "De parameter %s heeft een incorrecte waarde voor het type boolean."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:376
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -14878,31 +15149,31 @@ msgstr "Macronaam"
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 msgid "Create new phone macro"
 msgstr "Nieuwe telefoonmacro aanmaken"
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
-#: plugins/gofon/macro/class_divListMacros.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:132
+#: plugins/gofon/macro/class_divListMacros.inc:160
 #, fuzzy
 msgid "Edit macro"
 msgstr "Bewerk share"
 
-#: plugins/gofon/macro/class_divListMacros.inc:112
-#: plugins/gofon/macro/class_divListMacros.inc:132
+#: plugins/gofon/macro/class_divListMacros.inc:134
+#: plugins/gofon/macro/class_divListMacros.inc:168
 #, fuzzy
 msgid "Delete macro"
 msgstr "Verwijder gebruiker"
 
-#: plugins/gofon/macro/class_divListMacros.inc:115
+#: plugins/gofon/macro/class_divListMacros.inc:137
 msgid "Macro"
 msgstr "Macro"
 
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "visible"
 msgstr "zichtbaar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 msgid "invisible"
 msgstr "onzichtbaar"
 
@@ -14927,61 +15198,59 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Reguliere expressie voor       overeenkomende gebruikersnamen"
 
-#: plugins/gofon/conference/generic.tpl:13
+#: plugins/gofon/conference/generic.tpl:15
 msgid "Conference name"
 msgstr "Conferentienaam"
 
-#: plugins/gofon/conference/generic.tpl:18
+#: plugins/gofon/conference/generic.tpl:21
 msgid "Name of conference to create"
 msgstr "Naam van de aan te maken conferentie"
 
-#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 msgid "Choose subtree to place conference in"
 msgstr "Kies de subtree waaronder de conferentie geplaatst wordt"
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:90
 msgid "Lifetime (in days)"
 msgstr "Geldigheidsduur (in dagen)"
 
-#: plugins/gofon/conference/generic.tpl:104
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
+#: plugins/gofon/conference/generic.tpl:137
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
 msgid "Preset PIN"
 msgstr "Voorgedefinieerde PIN-code"
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:145
 #: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr "PIN-code"
 
-#: plugins/gofon/conference/generic.tpl:118
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
+#: plugins/gofon/conference/generic.tpl:157
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
 msgid "Record conference"
 msgstr "Conferentie opnemen"
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:165
 msgid "Sound file format"
 msgstr "Geluidsbestand formaat"
 
-#: plugins/gofon/conference/generic.tpl:143
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+#: plugins/gofon/conference/generic.tpl:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
 msgid "Play music on hold"
 msgstr "Muziek afspelen bij wachtstand"
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:196
 msgid "Activate session menu"
 msgstr "Activeer sessiemenu"
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:204
 msgid "Announce users joining or leaving the conference"
 msgstr "Kondig binnenkomende en verlatende gebruikers aan"
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:212
 msgid "Count users"
 msgstr "Tel het aantal gebruikers"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Tel. conferenties"
 
@@ -14989,12 +15258,12 @@ msgstr "Tel. conferenties"
 msgid "Management"
 msgstr "Beheer"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -15002,24 +15271,24 @@ msgstr ""
 "U heeft een conferentie 'zonder PIN-code' gespecificeerd ... laat a.u.b. de "
 "PIN-code velden leeg."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
 msgid "Please enter a PIN."
 msgstr "Voer a.u.b. een PIN-code in."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
 msgid "Please enter a name for the conference."
 msgstr "Voer a.u.b. een naam voor de conferentie in."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:228
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Alleen nummerieke karakters zijn toegestaan in het nummer veld."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Alleen nummerieke waardes zijn toegestaan in geldigheidsduur"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -15027,51 +15296,56 @@ msgstr ""
 "Kan geen veranderingen opslaan in de Asterisk database. Er is geen MySQL "
 "extensie beschikbaar. Controleer uw PHP installatie."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
 #, php-format
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_divListConferences.inc:202
+msgid "Conference"
+msgstr "Conferentie"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
 #, fuzzy
 msgid "Phone conference management"
 msgstr "Conferentie beheer"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
 msgid "GOfon"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
 #, fuzzy
 msgid "Conference PIN"
 msgstr "Conferentie"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
 #, fuzzy
 msgid "Activate menu"
 msgstr "Activeer sessiemenu"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
 #, fuzzy
 msgid "Announce user activity"
 msgstr "Aankondigingsfrequentie"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
 #, fuzzy
 msgid "Count user"
 msgstr "Tel het aantal gebruikers"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
 #, fuzzy
 msgid "Conference type"
 msgstr "Conferentienaam"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
 #, fuzzy
 msgid "Format"
 msgstr "formaat"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
 #, fuzzy
 msgid "Lifetime"
 msgstr "Geldigheidsduur (in dagen)"
@@ -15088,38 +15362,43 @@ msgstr "Naam - nummer"
 msgid "Regular expression for matching conference names"
 msgstr "Reguliere expressie voor overeenkomende conferentie namen"
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 msgid "Create new conference"
 msgstr "Maak nieuwe conferentie aan"
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 msgid "New conference"
 msgstr "Nieuwe conferentie"
 
-#: plugins/gofon/conference/class_divListConferences.inc:154
-msgid "Conference"
-msgstr "Conferentie"
+#: plugins/gofon/conference/class_divListConferences.inc:196
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
+msgid "Unknown"
+msgstr "Onbekend"
 
 #: plugins/gofon/fonreports/contents.tpl:31
+#: plugins/gofon/fonreports/class_fonreport.inc:399
 msgid "Source"
 msgstr "Bron"
 
 #: plugins/gofon/fonreports/contents.tpl:32
+#: plugins/gofon/fonreports/class_fonreport.inc:400
 msgid "Destination"
 msgstr "Doel"
 
 #: plugins/gofon/fonreports/contents.tpl:33
+#: plugins/gofon/fonreports/class_fonreport.inc:401
 msgid "Channel"
 msgstr "Kanaal"
 
 #: plugins/gofon/fonreports/contents.tpl:36
+#: plugins/gofon/fonreports/class_fonreport.inc:404
 msgid "Duration"
 msgstr "Tijdsduur"
 
-#: plugins/gofon/fonreports/main.inc:21
-#: plugins/gofon/fonreports/class_fonreport.inc:356
-#: plugins/gofon/fonreports/class_fonreport.inc:357
-#: plugins/gofon/fonreports/class_fonreport.inc:365
+#: plugins/gofon/fonreports/main.inc:16
+#: plugins/gofon/fonreports/class_fonreport.inc:389
+#: plugins/gofon/fonreports/class_fonreport.inc:390
 msgid "Phone reports"
 msgstr "Tel. rapporten"
 
@@ -15127,21 +15406,31 @@ msgstr "Tel. rapporten"
 msgid "Phone Reports"
 msgstr "Telefoon rapporten"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofon/fonreports/class_fonreport.inc:170
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 "Kan niet verbinden met de telefoondatabase. Rapporten kunnen niet getoond "
 "worden!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:171
+#: plugins/gofon/fonreports/class_fonreport.inc:174
 msgid "Can't select phone database for report generation!"
 msgstr "Kan de telefoondatabase voor rapportage niet selecteren!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:189
+#: plugins/gofon/fonreports/class_fonreport.inc:192
 msgid "Query for phone database failed!"
 msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:402
+#, fuzzy
+msgid "Application called"
+msgstr "Programmanaam"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:403
+#, fuzzy
+msgid "Disposition"
+msgstr "Max. verbrekingsduur"
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -15191,7 +15480,7 @@ msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
 
-#: include/php_setup.inc:71 html/main.php:386
+#: include/php_setup.inc:71 html/main.php:388
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
@@ -15311,11 +15600,11 @@ msgstr ""
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1120 include/functions.inc:1312
+#: include/functions.inc:1039 include/functions.inc:1226
 msgid "LDAP error:"
 msgstr "LDAP fout:"
 
-#: include/functions.inc:1121
+#: include/functions.inc:1040
 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."
@@ -15324,7 +15613,7 @@ msgstr ""
 "verloren gegaan zijn. Controleer uw LDAP instellingen voor mogelijke fouten "
 "en probeer het opnieuw."
 
-#: include/functions.inc:1129
+#: include/functions.inc:1048
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -15332,23 +15621,23 @@ msgstr ""
 "Controleer uw invoer a.u.b. en verbeter de fout. Druk 'OK' om dit "
 "berichtvenster te sluiten."
 
-#: include/functions.inc:1138
+#: include/functions.inc:1057
 msgid "An error occured while processing your request"
 msgstr "Er is een fout opgetreden bij het verwerken van uw aanvraag"
 
-#: include/functions.inc:1142 include/functions_setup.inc:254
+#: include/functions.inc:1061 include/functions_setup.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: include/functions.inc:1204
+#: include/functions.inc:1123
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1206
+#: include/functions.inc:1125
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1208
+#: include/functions.inc:1127
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -15358,28 +15647,28 @@ msgstr ""
 "gebruiker '%s'. Neem a.u.b. contact op met deze persoon om eea kort te "
 "sluiten."
 
-#: include/functions.inc:1494
+#: include/functions.inc:1408
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1522
+#: include/functions.inc:1436
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1710
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1839
+#: include/functions.inc:1753
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/class_mail-methods-cyrus.inc:39
+#: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr "Waarschuwing: Het account heeft een ongeldige mailserver string!"
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_mail-methods-cyrus.inc:53
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -15388,50 +15677,50 @@ msgstr ""
 "bewaart dan zullen sommige E-mail instellingen niet opgeslagen worden op de "
 "mail server!"
 
-#: include/class_mail-methods-cyrus.inc:129
+#: include/class_mail-methods-cyrus.inc:151
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:148
+#: include/class_mail-methods-cyrus.inc:170
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 "Kan de IMAP quota instellingen niet wegschrijven. De IMAP server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:174
+#: include/class_mail-methods-cyrus.inc:196
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Waarschuwing: De PHP functie 'imap_getacl' is niet voorhanden. "
 "Toegangsbeheer informatie kan niet veranderd worden."
 
-#: include/class_mail-methods-cyrus.inc:192
+#: include/class_mail-methods-cyrus.inc:214
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
 "kunnen niet opgehaald worden!"
 
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:242
+#: include/class_mail-methods-cyrus.inc:264
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:255
+#: include/class_mail-methods-cyrus.inc:277
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:326
+#: include/class_mail-methods-cyrus.inc:348
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:330
+#: include/class_mail-methods-cyrus.inc:352
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
@@ -15512,16 +15801,16 @@ msgstr ""
 msgid "Ldap import with dn '%s' failed."
 msgstr "Het opslaan van de printer is mislukt"
 
-#: include/class_tabs.inc:195
+#: include/class_tabs.inc:188
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
 
-#: include/class_tabs.inc:310
+#: include/class_tabs.inc:306
 msgid "References"
 msgstr "Referenties"
 
-#: include/class_plugin.inc:418
+#: include/class_plugin.inc:420
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15529,7 +15818,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:599
+#: include/class_plugin.inc:601
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15537,7 +15826,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:633 include/class_password-methods.inc:181
+#: include/class_plugin.inc:635 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15545,7 +15834,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:667
+#: include/class_plugin.inc:669
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15553,62 +15842,62 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:973
+#: include/class_plugin.inc:975
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Object '%s' is al gemarkeerd"
 
-#: include/class_plugin.inc:980
+#: include/class_plugin.inc:982
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Toevoegen van markering (%s) aan object '%s'"
 
-#: include/class_plugin.inc:994 include/class_plugin.inc:1023
+#: include/class_plugin.inc:996 include/class_plugin.inc:1025
 #, fuzzy, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr "Het verwerken van object markeringen is mislukt"
 
-#: include/class_plugin.inc:1010
+#: include/class_plugin.inc:1012
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Verwijderen van markering van object '%s'"
 
-#: include/class_plugin.inc:1071 include/class_plugin.inc:1117
-#: include/class_plugin.inc:1118
+#: include/class_plugin.inc:1073 include/class_plugin.inc:1119
+#: include/class_plugin.inc:1120
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Het opslaan van de objectgroep is mislukt"
 
-#: include/class_plugin.inc:1134 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1135
 #, fuzzy
 msgid "You are not allowed to delete this snapshot!"
 msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
 
-#: include/class_plugin.inc:1149
+#: include/class_plugin.inc:1151
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1161
+#: include/class_plugin.inc:1163
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1193
+#: include/class_plugin.inc:1195
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1249
+#: include/class_plugin.inc:1251
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
+#: include/class_plugin.inc:1315 include/class_plugin.inc:1329
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Het verwijderen van de telefoon is mislukt"
@@ -15630,11 +15919,6 @@ msgstr ""
 "Uw gosa.conf is gedeeltelijk veranderd. Converteer het a.u.b. met het "
 "meegeleverde script fix_config.sh!"
 
-#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
-#: include/class_pluglist.inc:245
-msgid "Unknown"
-msgstr "Onbekend"
-
 #: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -16475,7 +16759,7 @@ msgid "Restore"
 msgstr "Opnieuw proberen"
 
 #: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:105
+#: include/class_SnapShotDialog.inc:106
 msgid "Restore snapshot"
 msgstr ""
 
@@ -16537,21 +16821,21 @@ msgstr ""
 msgid "Release management failed, can't save '%s'"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:47
+#: include/class_SnapShotDialog.inc:53
 #, fuzzy, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "U staat op het punt de macro '%s' te verwijderen."
 
-#: include/class_SnapShotDialog.inc:107
+#: include/class_SnapShotDialog.inc:108
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:141
+#: include/class_SnapShotDialog.inc:142
 #, fuzzy
 msgid "Please specify a valid description for this snapshot."
 msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
@@ -16612,16 +16896,16 @@ msgstr ""
 "Waarschuwing: Geheugengebruik is te hoog - verhoog a.u.b. de 'memory_limit' "
 "in PHP!"
 
-#: html/main.php:347
+#: html/main.php:349
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
 
-#: html/main.php:362
+#: html/main.php:364
 msgid "Your password is about to expire, please change your password"
 msgstr "Uw wachtwoord zal spoedig verlopen! Kies a.u.b. een nieuw wachtwoord."
 
-#: html/main.php:386
+#: html/main.php:388
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -16698,99 +16982,91 @@ msgstr ""
 "Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en "
 "herlaad deze pagina voordat u inlogt!"
 
-#: html/getxls.php:65
+#: html/getxls.php:86
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
+#: html/getxls.php:86 html/getxls.php:227 html/getxls.php:281
+#: html/getxls.php:297
 msgid "Surname"
 msgstr "Achternaam"
 
-#: html/getxls.php:74
+#: html/getxls.php:94
 #, php-format
 msgid "User list of %s on %s"
 msgstr "Gebruikerslijst van %s in %s "
 
-#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
+#: html/getxls.php:121 html/getxls.php:284 ihtml/themes/default/acl.tpl:41
 msgid "Members"
 msgstr "Groepsleden"
 
-#: html/getxls.php:104 html/getxls.php:295
+#: html/getxls.php:131 html/getxls.php:360
 #, php-format
 msgid "Groups of %s on %s"
 msgstr "Groepen van %s in %s"
 
-#: html/getxls.php:124 html/getxls.php:246
-msgid "Computers"
-msgstr "Computers"
-
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-msgid "Common name"
-msgstr "Algemene naam"
-
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+#: html/getxls.php:155 html/getxls.php:188 html/getxls.php:190
+#: html/getxls.php:197 html/getxls.php:233 html/getxls.php:310
+#: html/getxls.php:381
 msgid "Servers"
 msgstr "Servers"
 
-#: html/getxls.php:156 html/getxls.php:314
+#: html/getxls.php:159 html/getxls.php:311
+msgid "Computers"
+msgstr "Computers"
+
+#: html/getxls.php:195 html/getxls.php:379
 #, php-format
 msgid "Servers of %s on %s"
 msgstr "Servers van %s in %s"
 
-#: html/getxls.php:174
+#: html/getxls.php:225
 msgid "Mobile phone"
 msgstr "GSM nummer"
 
-#: html/getxls.php:174
+#: html/getxls.php:228
 msgid "Function"
 msgstr "Functie"
 
-#: html/getxls.php:177 html/getxls.php:247
+#: html/getxls.php:231 html/getxls.php:312
 msgid "Adressbook"
 msgstr "Adresboek"
 
-#: html/getxls.php:184 html/getxls.php:349
+#: html/getxls.php:238 html/getxls.php:414
 #, php-format
 msgid "Adressbook of %s on %s"
 msgstr "Adresboek van %s in %s"
 
-#: html/getxls.php:190
+#: html/getxls.php:244
 msgid "Common Name"
 msgstr "Algemene naam"
 
-#: html/getxls.php:224
+#: html/getxls.php:281
 msgid "Day of birth"
 msgstr "Geboortedatum"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Organizational unit"
 msgstr "Afdeling"
 
-#: html/getxls.php:236
+#: html/getxls.php:300
 msgid "Postal Code"
 msgstr "Postcode"
 
-#: html/getxls.php:236
-msgid "Title"
-msgstr "Titel"
-
-#: html/getxls.php:239
+#: html/getxls.php:304
 msgid "Full"
 msgstr "Volledig"
 
-#: html/getxls.php:276
+#: html/getxls.php:341
 #, php-format
 msgid "User List of %s on %s"
 msgstr "Gebruikerslijst van %s in %s"
 
-#: html/getxls.php:330
+#: html/getxls.php:395
 #, php-format
 msgid "Computers of %s on %s"
 msgstr "Computers van %s in %s"
@@ -17245,7 +17521,8 @@ msgid "ACLs for this object"
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+#, fuzzy
+msgid "Copy & paste wizard"
 msgstr "Kopieren &amp; plakken wizard"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:4
@@ -17258,7 +17535,7 @@ msgstr ""
 "combinaties geen zin hebben. GOsa toont de relevante attributen. Bewaar de "
 "waardes hieronder a.u.b. om aan deze vereisten te voldoen."
 
-#: ihtml/themes/default/copyPasteDialog.tpl:21
+#: ihtml/themes/default/copyPasteDialog.tpl:20
 msgid "Operation complete"
 msgstr "Bewerking afgerond"
 
@@ -17310,27 +17587,57 @@ msgstr ""
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:43
 #, fuzzy
 msgid "Creating object snapshots"
 msgstr "Nieuwe objectgroep aanmaken"
 
-#: ihtml/themes/default/snapshotdialog.tpl:47
+#: ihtml/themes/default/snapshotdialog.tpl:46
 msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:62
+#: ihtml/themes/default/snapshotdialog.tpl:61
 #, fuzzy
 msgid "Timestamp"
 msgstr "Timeout"
 
-#: ihtml/themes/default/snapshotdialog.tpl:71
+#: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Reason for generating this snapshot"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Pgaer"
+#~ msgstr "Pieper"
+
+#~ msgid "Select subtree to place blocklist in"
+#~ msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
+
+#~ msgid "No permission to create a blocklist on this base."
+#~ msgstr ""
+#~ "Geen toestemming om een blokkeerlijst aan te maken onder deze basis."
+
+#~ msgid ""
+#~ "You have no permissions to create or modify a global address book entry."
+#~ msgstr ""
+#~ "U heeft geen toestemming om globale adresboek invoeren te wijzigen of aan "
+#~ "te maken."
+
+#~ msgid "You've no permission to do LDAP imports."
+#~ msgstr "U heeft geen toestemming om LDAP gegevens te importeren."
+
+#~ msgid "You've no permission to do LDAP exports."
+#~ msgstr "U heeft geen toestemming om LDAP gegevens te exporteren."
+
+#~ msgid "Choose subtree to place macro in"
+#~ msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
+
+#~ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+#~ msgstr ""
+#~ "Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
+
 #, fuzzy
 #~ msgid "File servive (Shares)"
 #~ msgstr "Bestandserver"
@@ -17484,10 +17791,6 @@ msgstr ""
 #~ msgid "Log"
 #~ msgstr "Inlognaam"
 
-#, fuzzy
-#~ msgid "Log service"
-#~ msgstr "Log DB gebruiker"
-
 #, fuzzy
 #~ msgid "Removing server services/gokrb with dn '%s' failed."
 #~ msgstr "Het opslaan van het server service object is mislukt"
@@ -17645,10 +17948,6 @@ msgstr ""
 #~ msgid "mailEnabled"
 #~ msgstr "gedeactiveerd"
 
-#, fuzzy
-#~ msgid "Connectivity  account"
-#~ msgstr "Verbindingen"
-
 #, fuzzy
 #~ msgid "GOsa intranet account"
 #~ msgstr "Intranet account"
@@ -17791,9 +18090,6 @@ msgstr ""
 #~ msgid "Saving FAX account failed"
 #~ msgstr "Het opslaan van het Fax account is mislukt"
 
-#~ msgid "Saving addressbook entry failed"
-#~ msgstr "Het opslaan van de adresboek invoer is mislukt"
-
 #~ msgid "Removing FAI script base failed"
 #~ msgstr "Het verwijderen van de FAI script basis is mislukt"
 
@@ -17860,9 +18156,6 @@ msgstr ""
 #~ msgid "Removing ACL information failed"
 #~ msgstr "Het verwijderen van de ACL informatie is mislukt"
 
-#~ msgid "All fields are writeable"
-#~ msgstr "Alle velden zijn aanpasbaar"
-
 #~ msgid "Removing application information failed"
 #~ msgstr "Het verwijderen van de programma informatie is mislukt"