Exported ppd_path to gosa.conf.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 9f5a2f45991b1637064e6fb6fa9b598b1f280389..6ef624c288700284f17d138834730e9be4061a28 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -2,19 +2,19 @@
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:26
+#: contrib/gosa.conf:28
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:49
+#: contrib/gosa.conf:51
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:64 contrib/gosa.conf:76 contrib/gosa.conf:85
-#: contrib/gosa.conf:91 contrib/gosa.conf:96 contrib/gosa.conf:102
-#: contrib/gosa.conf:111 contrib/gosa.conf:120 contrib/gosa.conf:129
-#: contrib/gosa.conf:134 contrib/gosa.conf:139 contrib/gosa.conf:144
-#: contrib/gosa.conf:149 contrib/gosa.conf:154
+#: contrib/gosa.conf:70 contrib/gosa.conf:83 contrib/gosa.conf:92
+#: contrib/gosa.conf:98 contrib/gosa.conf:103 contrib/gosa.conf:109
+#: contrib/gosa.conf:118 contrib/gosa.conf:127 contrib/gosa.conf:136
+#: contrib/gosa.conf:141 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161
 #: 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
@@ -33,118 +33,123 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:65
+#: contrib/gosa.conf:71
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:66 contrib/gosa.conf:77
+#: contrib/gosa.conf:72 contrib/gosa.conf:84
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/groups/class_groupManagement.inc:380
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:67 contrib/gosa.conf:79
+#: contrib/gosa.conf:73 contrib/gosa.conf:86
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/users/class_userManagement.inc:731
 #: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:158
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:68 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:720
+#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:377
+#: plugins/admin/users/class_userManagement.inc:737
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:69 plugins/personal/connectivity/main.inc:135
+#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:135
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:70 plugins/personal/generic/generic.tpl:241
+#: contrib/gosa.conf:76 plugins/personal/generic/generic.tpl:241
 #: plugins/personal/generic/generic.tpl:372
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:718
-#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/users/class_userManagement.inc:735
+#: plugins/admin/departments/generic.tpl:62 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:71 plugins/personal/generic/generic.tpl:224
+#: contrib/gosa.conf:77 plugins/personal/generic/generic.tpl:224
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/groups/class_groupManagement.inc:379
+#: plugins/admin/users/class_userManagement.inc:733
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:709
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:72 contrib/gosa.conf:81 contrib/gosa.conf:87
-#: contrib/gosa.conf:92 contrib/gosa.conf:98 contrib/gosa.conf:107
-#: contrib/gosa.conf:116 contrib/gosa.conf:125 contrib/gosa.conf:130
-#: contrib/gosa.conf:135 contrib/gosa.conf:140 contrib/gosa.conf:145
-#: contrib/gosa.conf:150 contrib/gosa.conf:155
+#: contrib/gosa.conf:78 plugins/personal/nagios/class_nagiosAccount.inc:18
+msgid "Nagios"
+msgstr ""
+
+#: contrib/gosa.conf:79 contrib/gosa.conf:88 contrib/gosa.conf:94
+#: contrib/gosa.conf:99 contrib/gosa.conf:105 contrib/gosa.conf:114
+#: contrib/gosa.conf:123 contrib/gosa.conf:132 contrib/gosa.conf:137
+#: contrib/gosa.conf:142 contrib/gosa.conf:147 contrib/gosa.conf:152
+#: contrib/gosa.conf:157 contrib/gosa.conf:162
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:78
+#: contrib/gosa.conf:85
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:80
+#: contrib/gosa.conf:87
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:86 plugins/admin/applications/generic.tpl:58
-#: plugins/admin/systems/class_printerPPDDialog.inc:162
+#: contrib/gosa.conf:93 plugins/admin/applications/generic.tpl:58
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:97 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
+#: contrib/gosa.conf:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:640
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:103 contrib/gosa.conf:121
+#: contrib/gosa.conf:110 contrib/gosa.conf:128
 #: plugins/admin/ogroups/tabs_ogroups.inc:93
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:104 contrib/gosa.conf:122
+#: contrib/gosa.conf:111 contrib/gosa.conf:129
 #: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:105 contrib/gosa.conf:123
+#: contrib/gosa.conf:112 contrib/gosa.conf:130
 #: plugins/personal/environment/environment.tpl:168
-#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/systems/class_systemManagement.inc:715
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/admin/ogroups/class_ogroupManagement.inc:490
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:106 contrib/gosa.conf:115 contrib/gosa.conf:124
+#: contrib/gosa.conf:113 contrib/gosa.conf:122 contrib/gosa.conf:131
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/blocklists/generic.tpl:67
@@ -154,7 +159,7 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
 #: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:24
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/headpage.tpl:20
 #: plugins/admin/fai/faiProfileEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/fai/faiPackageEntry.tpl:22
@@ -163,21 +168,28 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:112
+#: contrib/gosa.conf:119
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:113 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:167 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
+#: plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: plugins/addons/ldapmanager/contentexportxls.tpl:32
+#: plugins/addons/ldapmanager/contentexportxls.tpl:47
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:168 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:178
+msgid "Excel Export"
+msgstr ""
+
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
@@ -186,73 +198,73 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:177 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:81
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:181 plugins/admin/fai/class_faiManagement.inc:542
-#: plugins/admin/fai/class_faiManagement.inc:543
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:545
+#: plugins/admin/fai/class_faiManagement.inc:546
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:535
-#: plugins/admin/fai/class_faiManagement.inc:536
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:538
+#: plugins/admin/fai/class_faiManagement.inc:539
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:556
-#: plugins/admin/fai/class_faiManagement.inc:557
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:559
+#: plugins/admin/fai/class_faiManagement.inc:560
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:193 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:197
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:213
+#: contrib/gosa.conf:224
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:230 plugins/admin/ogroups/class_phonequeue.inc:161
+#: contrib/gosa.conf:241 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:231
+#: contrib/gosa.conf:242
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:232
+#: contrib/gosa.conf:243
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:233
+#: contrib/gosa.conf:244
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:234
+#: contrib/gosa.conf:245
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:235
+#: contrib/gosa.conf:246
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:247
 msgid "Italian"
 msgstr ""
 
@@ -269,6 +281,9 @@ msgstr ""
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -279,7 +294,9 @@ msgstr ""
 #: plugins/addons/ldapmanager/class_import.inc:7
 #: plugins/addons/ldapmanager/class_ldif.inc:8
 #: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
 #: plugins/admin/applications/class_applicationManagement.inc:26
@@ -302,98 +319,98 @@ msgstr ""
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:203
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
+#: plugins/personal/mail/class_mailAccount.inc:213
+#: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/personal/mail/class_mailAccount.inc:215
+#: plugins/admin/groups/class_groupMail.inc:193
+#: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
+#: plugins/personal/mail/class_mailAccount.inc:215
+#: plugins/admin/groups/class_groupMail.inc:194
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:263
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
+#: plugins/personal/mail/class_mailAccount.inc:269
+#: plugins/admin/groups/class_groupMail.inc:253
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
+#: plugins/personal/mail/class_mailAccount.inc:304
+#: plugins/personal/mail/class_mailAccount.inc:309
+#: plugins/admin/groups/class_groupMail.inc:281
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
+#: plugins/personal/mail/class_mailAccount.inc:319
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:689
+#: plugins/personal/mail/class_mailAccount.inc:692
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
+#: plugins/personal/mail/class_mailAccount.inc:697
+#: plugins/admin/groups/class_groupMail.inc:613
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
+#: plugins/personal/mail/class_mailAccount.inc:701
+#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/admin/ogroups/class_mailogroup.inc:70
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
+#: plugins/personal/mail/class_mailAccount.inc:712
+#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/ogroups/class_mailogroup.inc:77
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
+#: plugins/personal/mail/class_mailAccount.inc:718
+#: plugins/admin/groups/class_groupMail.inc:628
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/admin/groups/class_groupMail.inc:637
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
+#: plugins/personal/mail/class_mailAccount.inc:737
+#: plugins/admin/groups/class_groupMail.inc:645
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:738
+#: plugins/personal/mail/class_mailAccount.inc:741
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
@@ -403,8 +420,8 @@ msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -418,7 +435,8 @@ msgid "Quota usage"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:147
+#: plugins/admin/systems/class_terminalInfo.inc:150
+#: plugins/admin/systems/class_printGeneric.inc:360
 msgid "not defined"
 msgstr ""
 
@@ -444,27 +462,27 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:307
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/environment/environment.tpl:117
 #: plugins/personal/environment/environment.tpl:134
 #: plugins/personal/environment/environment.tpl:177
 #: plugins/personal/environment/hotplugDialog.tpl:73
-#: plugins/personal/environment/selectPrinterDialog.tpl:71
+#: plugins/personal/environment/selectPrinterDialog.tpl:70
 #: plugins/personal/environment/kioskManagement.tpl:13
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/class_groupMail.inc:407
 #: plugins/admin/groups/group_objects.tpl:49
 #: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/phonesettings.tpl:181
 #: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:70
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:73
 #: plugins/admin/systems/workstationStartup.tpl:92
@@ -475,7 +493,7 @@ msgstr ""
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/fai/class_faiProfile.inc:149
+#: plugins/admin/fai/class_faiProfile.inc:153
 #: plugins/admin/fai/faiProfile.tpl:37 plugins/admin/fai/faiScript.tpl:43
 #: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/faiHook.tpl:43
 #: plugins/gofon/phoneaccount/generic.tpl:13
@@ -491,30 +509,30 @@ msgstr ""
 #: plugins/personal/environment/environment.tpl:162
 #: plugins/personal/environment/environment.tpl:178
 #: plugins/gofax/blocklists/generic.tpl:64
-#: plugins/gofax/blocklists/remove.tpl:15
+#: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
-#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/generic.tpl:101 plugins/admin/users/remove.tpl:15
-#: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/departments/remove.tpl:15
+#: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:55
+#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:101 plugins/admin/users/remove.tpl:14
+#: plugins/admin/applications/remove.tpl:13
+#: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/printer.tpl:85 plugins/admin/systems/printer.tpl:102
-#: plugins/admin/systems/remove.tpl:15
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/workstationStartup.tpl:54
 #: plugins/admin/systems/workstationStartup.tpl:74
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
+#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
 #: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiProfile.tpl:38
 #: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:45
 #: plugins/admin/fai/faiHook.tpl:45 plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/macro/remove.tpl:14 plugins/gofon/conference/remove.tpl:15
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr ""
 
@@ -561,7 +579,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:81
 #: plugins/personal/environment/environment.tpl:71
 msgid "MB"
 msgstr ""
@@ -608,16 +626,16 @@ msgstr ""
 #: plugins/personal/nagios/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:77
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:615
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:536
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/admin/fai/class_faiManagement.inc:381
+#: plugins/admin/groups/class_groupManagement.inc:331
+#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/applications/class_applicationManagement.inc:304
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:339
+#: plugins/admin/fai/class_faiManagement.inc:384
 #: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:269
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:272
 msgid "Finish"
 msgstr ""
 
@@ -633,48 +651,51 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:117
 #: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:74
-#: plugins/personal/environment/selectPrinterDialog.tpl:72
+#: plugins/personal/environment/selectPrinterDialog.tpl:71
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
 #: plugins/personal/nagios/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:64
 #: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/remove.tpl:17
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:617
-#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/users/class_userManagement.inc:634
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:306
+#: plugins/admin/departments/remove.tpl:16
+#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
 #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:92
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
+#: plugins/admin/systems/printerPPDDialog.tpl:23
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:71
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17 plugins/admin/fai/remove.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:383
-#: plugins/admin/fai/class_faiManagement.inc:388
+#: plugins/admin/ogroups/class_ogroupManagement.inc:341
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/class_faiManagement.inc:386
+#: plugins/admin/fai/class_faiManagement.inc:391
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiProfileEntry.tpl:72
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:133
+#: plugins/admin/fai/faiPackageEntry.tpl:66
 #: plugins/admin/fai/faiPackageNew.tpl:66
-#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:271
-#: plugins/gofon/conference/remove.tpl:17
+#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:15
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:274
+#: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr ""
@@ -698,7 +719,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:96
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:61
+#: plugins/admin/systems/printer.tpl:46
 #: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
 #: plugins/admin/fai/faiTemplate.tpl:44 plugins/admin/fai/faiHook.tpl:44
@@ -719,7 +740,7 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:20
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:34
-#: plugins/personal/environment/selectPrinterDialog.tpl:35
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
@@ -729,13 +750,14 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
 #: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:32
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29
 #: plugins/admin/fai/faiProfileEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
 #: plugins/admin/fai/faiPackageEntry.tpl:34
 #: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:28
+#: plugins/gofon/conference/headpage.tpl:29
 msgid "Filters"
 msgstr ""
 
@@ -748,7 +770,7 @@ msgstr ""
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:45
+#: plugins/personal/environment/selectPrinterDialog.tpl:44
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
 #: plugins/admin/groups/group_objects.tpl:34
@@ -781,7 +803,7 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:658
+#: plugins/admin/systems/class_systemManagement.inc:661
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
@@ -794,7 +816,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:681
 msgid "Change password"
 msgstr ""
 
@@ -818,19 +840,19 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:20
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:11
+#: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr ""
 
 #: plugins/personal/password/password.tpl:25
 #: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
+#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr ""
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr ""
 
@@ -848,8 +870,9 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
-#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
+#: include/functions.inc:1285 ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
@@ -873,14 +896,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:264
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:266
+#: plugins/admin/users/class_userManagement.inc:269
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -972,23 +995,22 @@ msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/groups/headpage.tpl:66
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:74 plugins/admin/groups/headpage.tpl:75
+#: plugins/admin/groups/headpage.tpl:73
 msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/admin/groups/headpage.tpl:76
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1003,7 +1025,7 @@ msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:85
-#: plugins/personal/samba/class_sambaAccount.inc:630
+#: plugins/personal/samba/class_sambaAccount.inc:633
 msgid "Home directory"
 msgstr ""
 
@@ -1062,7 +1084,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:963
 msgid "Group of user"
 msgstr ""
 
@@ -1077,273 +1099,273 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:219
+#: plugins/personal/posix/class_posixAccount.inc:222
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:240
 #: plugins/personal/posix/class_posixAccount.inc:243
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:241
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:250
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:251
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:432
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:434
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:436
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:438
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:545
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:545
+#: plugins/personal/posix/class_posixAccount.inc:548
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:546
+#: plugins/personal/posix/class_posixAccount.inc:549
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:715
+#: plugins/personal/posix/class_posixAccount.inc:718
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:874
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: plugins/personal/posix/class_posixAccount.inc:888
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:888
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:892
-#: plugins/admin/groups/class_groupGeneric.inc:642
+#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:645
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:895
-#: plugins/admin/groups/class_groupGeneric.inc:645
+#: plugins/personal/posix/class_posixAccount.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:648
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:906
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:911
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:913
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:925
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:938
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1039
-#: plugins/admin/groups/class_groupGeneric.inc:676
+#: plugins/personal/posix/class_posixAccount.inc:1042
+#: plugins/admin/groups/class_groupGeneric.inc:679
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1357,7 +1379,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:95
-#: plugins/personal/samba/class_sambaAccount.inc:631
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Profile path"
 msgstr ""
 
@@ -1406,17 +1428,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:136
-#: plugins/personal/samba/class_sambaAccount.inc:638
+#: plugins/personal/samba/class_sambaAccount.inc:641
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:145
-#: plugins/personal/samba/class_sambaAccount.inc:639
+#: plugins/personal/samba/class_sambaAccount.inc:642
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:154
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/samba/class_sambaAccount.inc:643
 msgid "IDLE"
 msgstr ""
 
@@ -1489,256 +1511,235 @@ msgstr ""
 msgid "Display workstations matching"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:193
+#: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:202
+#: plugins/personal/samba/class_sambaAccount.inc:205
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:203
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
 #: plugins/personal/samba/class_sambaAccount.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:217
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:220
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:455
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/samba/class_sambaAccount.inc:636
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:833
+#: plugins/personal/samba/class_sambaAccount.inc:836
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:858
+#: plugins/personal/samba/class_sambaAccount.inc:861
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:248
+#: plugins/personal/generic/class_user.inc:251
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:248
+#: plugins/personal/generic/class_user.inc:251
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:252
-msgid "fr_FR"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "en_EN"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "de_DE"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "it_IT"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "nl_NL"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:262
+#: plugins/personal/generic/class_user.inc:265
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:291
+#: plugins/personal/generic/class_user.inc:294
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:427
 #, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:427
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:427
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:431
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:838
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:852
+#: plugins/personal/generic/class_user.inc:855
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:863
+#: plugins/personal/generic/class_user.inc:866
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:893
+#: plugins/personal/generic/class_user.inc:896
 msgid "Invalid characters in uid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:907
+#: plugins/personal/generic/class_user.inc:910
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/generic/class_user.inc:915
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:918
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:529
+#: plugins/personal/generic/class_user.inc:921
+#: plugins/addons/addressbook/class_addressbook.inc:530
+#: plugins/admin/users/class_userManagement.inc:546
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:927
+#: plugins/personal/generic/class_user.inc:930
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:534
+#: plugins/admin/users/class_userManagement.inc:549
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:936
+#: plugins/personal/generic/class_user.inc:939
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:943
+#: plugins/personal/generic/class_user.inc:946
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:950
+#: plugins/personal/generic/class_user.inc:953
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:956
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/personal/generic/class_user.inc:984
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:987
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/admin/departments/class_departmentGeneric.inc:169
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:959
-#: plugins/personal/generic/class_user.inc:981
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
+#: plugins/personal/generic/class_user.inc:962
+#: plugins/personal/generic/class_user.inc:984
+#: plugins/addons/addressbook/class_addressbook.inc:543
+#: plugins/addons/addressbook/class_addressbook.inc:565
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:964
 #: plugins/personal/generic/class_user.inc:967
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:169
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
-
 #: plugins/personal/generic/class_user.inc:970
+#: plugins/addons/addressbook/class_addressbook.inc:548
 #: plugins/addons/addressbook/class_addressbook.inc:551
 #: plugins/admin/departments/class_departmentGeneric.inc:172
-msgid "The field 'Fax' contains an invalid phone number."
+msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:973
 #: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/admin/departments/class_departmentGeneric.inc:175
+msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:976
 #: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:979
+#: plugins/addons/addressbook/class_addressbook.inc:560
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1106
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -1766,10 +1767,8 @@ msgstr ""
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:98
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:112
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
@@ -1777,13 +1776,13 @@ msgstr ""
 #: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/gofon/macro/parameter.tpl:5
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr ""
@@ -1812,7 +1811,8 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Sex"
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:29
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
@@ -1880,21 +1880,21 @@ msgstr ""
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:183 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:187
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:586
-#: plugins/admin/ogroups/class_ogroupManagement.inc:414
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/applications/class_applicationManagement.inc:357
+#: plugins/admin/systems/class_systemManagement.inc:589
+#: plugins/admin/ogroups/class_ogroupManagement.inc:417
+#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
@@ -1924,21 +1924,22 @@ msgid "Mobile"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:235
+#: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:102
-#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Pager"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/printer.tpl:49
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:261
-#: plugins/admin/departments/generic.tpl:46
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
 msgid "State"
 msgstr ""
 
@@ -1976,7 +1977,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:339
 #: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr ""
 
@@ -2004,13 +2005,7 @@ msgstr ""
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/addons/addressbook/address_edit.tpl:114
 #: plugins/admin/systems/servnfs.tpl:91
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/fai/faiScriptEntry.tpl:67
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
 msgid "Save"
 msgstr ""
 
@@ -2021,15 +2016,16 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/personal/environment/environment.tpl:118
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/admin/groups/class_groupMail.inc:408
-#: plugins/admin/applications/class_applicationParameters.inc:94
+#: plugins/admin/groups/class_groupMail.inc:411
+#: plugins/admin/applications/class_applicationParameters.inc:97
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/admin/systems/workstationStartup.tpl:93
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/fai/faiPackage.tpl:74
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:246
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -2059,23 +2055,23 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
@@ -2107,55 +2103,55 @@ msgstr ""
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
+#: plugins/personal/connectivity/class_kolabAccount.inc:105
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
+#: plugins/personal/connectivity/class_kolabAccount.inc:113
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
+#: plugins/personal/connectivity/class_kolabAccount.inc:142
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:143
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:144
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
+#: plugins/personal/connectivity/class_kolabAccount.inc:180
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:232
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
+#: plugins/personal/connectivity/class_kolabAccount.inc:237
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/connectivity/class_kolabAccount.inc:251
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#: plugins/personal/connectivity/class_kolabAccount.inc:259
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2220,31 +2216,38 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#, php-format
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
+"This account has %s features disabled. Posix features are needed for "
+"openXchange accounts, enable them first."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
+msgid "OpenXchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
+#, php-format
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
+"This account has %s features disabled. Mail features are needed for "
+"openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:789
+msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:793
+msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:797
+msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:1
@@ -2278,6 +2281,7 @@ msgid "Files"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/addons/mailqueue/contents.tpl:27
 msgid "Size"
 msgstr ""
 
@@ -2333,7 +2337,7 @@ msgstr ""
 msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
+#: plugins/personal/connectivity/class_connectivity.inc:63
 msgid "This account has no connectivity extensions."
 msgstr ""
 
@@ -2342,35 +2346,36 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:81
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:81
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/addons/mailqueue/class_mailqueue.inc:115
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:130
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:133
+#: plugins/personal/connectivity/class_proxyAccount.inc:136
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
@@ -2378,68 +2383,93 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr ""
+
+#: plugins/personal/connectivity/phpscheduleit.tpl:1
+msgid "PHPscheduleit account"
+msgstr ""
+
+#: plugins/personal/connectivity/pptp.tpl:1
+msgid "PPTP account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr ""
+
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr ""
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:250
+#: plugins/personal/environment/class_environment.inc:217
+#: plugins/personal/environment/class_environment.inc:253
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:215
-#: plugins/personal/environment/class_environment.inc:251
+#: plugins/personal/environment/class_environment.inc:218
+#: plugins/personal/environment/class_environment.inc:254
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:224
-#: plugins/personal/environment/class_environment.inc:229
-#: plugins/personal/environment/class_environment.inc:257
-#: plugins/personal/environment/class_environment.inc:262
+#: plugins/personal/environment/class_environment.inc:227
+#: plugins/personal/environment/class_environment.inc:232
+#: plugins/personal/environment/class_environment.inc:260
+#: plugins/personal/environment/class_environment.inc:265
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:225
-#: plugins/personal/environment/class_environment.inc:258
+#: plugins/personal/environment/class_environment.inc:228
+#: plugins/personal/environment/class_environment.inc:261
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:230
-#: plugins/personal/environment/class_environment.inc:263
+#: plugins/personal/environment/class_environment.inc:233
+#: plugins/personal/environment/class_environment.inc:266
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:449
-#: plugins/admin/systems/class_terminalStartup.inc:131
-#: plugins/admin/systems/class_workstationStartup.inc:277
+#: plugins/personal/environment/class_environment.inc:456
+#: plugins/personal/environment/class_environment.inc:458
+#: plugins/admin/systems/class_terminalStartup.inc:134
+#: plugins/admin/systems/class_workstationStartup.inc:280
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:677
+#: plugins/personal/environment/class_environment.inc:686
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:684
+#: plugins/personal/environment/class_environment.inc:693
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:706
+#: plugins/personal/environment/class_environment.inc:715
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:799
+#: plugins/personal/environment/class_environment.inc:808
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:869
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:984
+#: plugins/personal/environment/class_environment.inc:993
 msgid "Admin"
 msgstr ""
 
@@ -2526,8 +2556,8 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "New"
 msgstr ""
 
@@ -2543,23 +2573,23 @@ msgstr ""
 msgid "Admin Toggle"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:109
+#: plugins/personal/environment/class_hotplugDialog.inc:112
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:112
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:115
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:126
+#: plugins/personal/environment/class_hotplugDialog.inc:129
 msgid "Please select an entry or press cancel."
 msgstr ""
 
@@ -2588,7 +2618,7 @@ msgstr ""
 #: plugins/personal/environment/hotplugDialog.tpl:53
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/users/headpage.tpl:48
-#: plugins/gofon/conference/headpage.tpl:34
+#: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr ""
 
@@ -2596,8 +2626,8 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:64
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:95
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -2607,22 +2637,22 @@ msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:5
 #: plugins/personal/environment/selectPrinterDialog.tpl:10
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:5
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
 msgid "Select printer to add"
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:28
 msgid ""
-"This menu allows you to create, edit and delete selected printers. \n"
-"\t\t\t\t\t\t\tHaving a great number of printers, you may want to use the "
-"range selectors on top of the printers list."
+"This menu allows you to create, edit and delete selected printers. Having a "
+"great number of printers, you may want to use the range selectors on top of "
+"the printers list."
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:54
+#: plugins/personal/environment/selectPrinterDialog.tpl:53
 msgid "Display printers matching"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:59
+#: plugins/personal/environment/selectPrinterDialog.tpl:58
 msgid "Regular expression for matching printer names"
 msgstr ""
 
@@ -2640,7 +2670,7 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:24
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:18
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
 #: plugins/admin/ogroups/generic.tpl:13
@@ -2653,7 +2683,8 @@ msgstr ""
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
-#: plugins/generic/references/contents.tpl:11
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
+#: html/getxls.php:230
 msgid "Description"
 msgstr ""
 
@@ -2678,11 +2709,11 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:93
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
 msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
 msgid "Specified description contains invalid characters."
 msgstr ""
 
@@ -2707,22 +2738,22 @@ msgstr ""
 msgid "save"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#: plugins/personal/environment/class_kioskManagementDialog.inc:60
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:81
+#: plugins/personal/environment/class_kioskManagementDialog.inc:84
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:87
+#: plugins/personal/environment/class_kioskManagementDialog.inc:90
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2739,53 +2770,48 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:22
-#: plugins/admin/systems/printerPPDDialog.tpl:24
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:19
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:59
 msgid "Close"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:124
-msgid "User nagios settings"
+msgid "Nagios settings"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:18
-msgid "Nagios"
-msgstr ""
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:82
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:91
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:169
+#: plugins/personal/nagios/class_nagiosAccount.inc:163
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:166
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-#: plugins/personal/nagios/class_nagiosAccount.inc:180
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
@@ -2794,47 +2820,43 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:7
-msgid "alias"
+msgid "Alias"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:12
-msgid "email"
+#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:174
+msgid "Mail address"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:17
-msgid "Host Notification Period"
+msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:25
-msgid "Service Notification Period"
+msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:32
-msgid "Service Notification Options"
+msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:41
-msgid "Host Notification Options"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:48
-msgid "pager"
+msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
-msgid "Service Notification Commands"
+msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:57
-msgid "Host Notification Commands"
+msgid "Host notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios Auth"
+msgid "Nagios authentification"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:68
-msgid "authorized_for_system_information"
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "can view system informations"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2855,7 +2877,7 @@ msgstr ""
 #: plugins/admin/systems/servnfs.tpl:31
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:176
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr ""
@@ -2880,231 +2902,230 @@ msgstr ""
 msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:206
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:220
 msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:238
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/admin/applications/class_applicationManagement.inc:323
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:562
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/fai/class_faiManagement.inc:417
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/applications/class_applicationManagement.inc:326
+#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/admin/applications/class_applicationManagement.inc:323
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:562
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/applications/class_applicationManagement.inc:326
+#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:417
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
-#: plugins/admin/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:563
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
-#: plugins/admin/fai/class_faiManagement.inc:420
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/ogroups/class_ogroupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Go to root department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
-#: plugins/admin/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:563
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
-#: plugins/admin/fai/class_faiManagement.inc:420
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/ogroups/class_ogroupManagement.inc:361
+#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:654
-#: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:564
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/applications/class_applicationManagement.inc:328
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:654
-#: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:564
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/admin/fai/class_faiManagement.inc:423
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/applications/class_applicationManagement.inc:328
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
+#: plugins/admin/fai/class_faiManagement.inc:426
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:659
-#: plugins/admin/applications/class_applicationManagement.inc:329
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:573
-#: plugins/admin/ogroups/class_ogroupManagement.inc:364
-#: plugins/admin/fai/class_faiManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:676
+#: plugins/admin/applications/class_applicationManagement.inc:332
+#: plugins/admin/departments/class_departmentManagement.inc:286
+#: plugins/admin/systems/class_systemManagement.inc:576
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:333
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "Current base"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:574
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/admin/fai/class_faiManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/admin/fai/class_faiManagement.inc:456
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:574
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/admin/fai/class_faiManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/admin/fai/class_faiManagement.inc:456
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:663
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:579
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/admin/fai/class_faiManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/systems/class_systemManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/admin/fai/class_faiManagement.inc:474
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:663
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
+#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:665
-#: plugins/admin/applications/class_applicationManagement.inc:335
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:580
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/fai/class_faiManagement.inc:472
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
+#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/applications/class_applicationManagement.inc:338
+#: plugins/admin/departments/class_departmentManagement.inc:295
+#: plugins/admin/systems/class_systemManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:475
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:665
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
 msgid "Delete user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 msgid "Blocklist name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/applications/class_applicationManagement.inc:355
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:391
-#: plugins/admin/fai/class_faiManagement.inc:468
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
+#: plugins/admin/groups/class_groupManagement.inc:390
+#: plugins/admin/users/class_userManagement.inc:691
+#: plugins/admin/applications/class_applicationManagement.inc:358
+#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/systems/class_systemManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:394
+#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:318
 msgid "Actions"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
 msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-#: plugins/admin/departments/class_departmentGeneric.inc:154
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+#: plugins/admin/departments/class_departmentGeneric.inc:157
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:537
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
@@ -3120,19 +3141,17 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:7
+#: plugins/gofax/blocklists/remove.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:11
-#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
-#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
-msgid ""
-"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
-"abort."
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
 #: plugins/gofax/blocklists/headpage.tpl:6
@@ -3179,7 +3198,8 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Language"
 msgstr ""
 
@@ -3275,7 +3295,14 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1276
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiHookEntry.tpl:69
+#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: plugins/admin/fai/faiPackageEntry.tpl:65 include/functions.inc:1276
 msgid "Apply"
 msgstr ""
 
@@ -3290,51 +3317,51 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:111
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:114
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:120
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:126
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:127
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:195
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:473
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:477
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:485
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:487
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:493
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3353,8 +3380,8 @@ msgid "FAX ID"
 msgstr ""
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:544
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/systems/class_printGeneric.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr ""
@@ -3398,7 +3425,9 @@ msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/addons/mailqueue/contents.tpl:8
+#: plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr ""
 
@@ -3432,6 +3461,7 @@ msgid "Date"
 msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:29
 msgid "Sender"
 msgstr ""
 
@@ -3449,28 +3479,28 @@ msgstr ""
 msgid "FAX Reports"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
+#: plugins/gofax/reports/class_faxreport.inc:100
+#: plugins/gofax/reports/class_faxreport.inc:207
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
+#: plugins/gofax/reports/class_faxreport.inc:104
+#: plugins/gofax/reports/class_faxreport.inc:211
 msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
+#: plugins/gofax/reports/class_faxreport.inc:112
+#: plugins/gofax/reports/class_faxreport.inc:219
 msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:117
+#: plugins/gofax/reports/class_faxreport.inc:120
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
+#: plugins/gofax/reports/class_faxreport.inc:140
+#: plugins/gofax/reports/class_faxreport.inc:227
+#: plugins/gofon/reports/class_fonreport.inc:164
 msgid "Y-M-D"
 msgstr ""
 
@@ -3544,10 +3574,10 @@ msgid "Dial connection..."
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
+#: plugins/addons/addressbook/class_addressbook.inc:362
+#: plugins/addons/addressbook/class_addressbook.inc:369
+#: plugins/addons/addressbook/class_addressbook.inc:373
+#: plugins/addons/addressbook/class_addressbook.inc:457
 msgid "Dial"
 msgstr ""
 
@@ -3561,7 +3591,8 @@ msgid "Personal"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Initials"
 msgstr ""
 
@@ -3581,7 +3612,8 @@ msgid "Company"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
 msgid "City"
 msgstr ""
 
@@ -3590,7 +3622,7 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
+#: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
 "your really want to do this since there is no way for GOsa to get your data "
@@ -3605,82 +3637,85 @@ msgstr ""
 msgid "Addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:149
+#: plugins/addons/addressbook/class_addressbook.inc:152
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:153
+#: plugins/addons/addressbook/class_addressbook.inc:156
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:182
-#: plugins/addons/addressbook/class_addressbook.inc:286
+#: plugins/addons/addressbook/class_addressbook.inc:185
+#: plugins/addons/addressbook/class_addressbook.inc:289
 msgid "You are not allowed to delete this entry!"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:280
+#: plugins/addons/addressbook/class_addressbook.inc:283
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:376
+#: plugins/addons/addressbook/class_addressbook.inc:379
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:380
+#: plugins/addons/addressbook/class_addressbook.inc:383
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:466
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
-msgid "organizations user database"
+#: plugins/addons/addressbook/class_addressbook.inc:472
+msgid "user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:473
+#: plugins/addons/addressbook/class_addressbook.inc:476
 #, php-format
-msgid "Contact stored in %s"
+msgid "Contact stored in '%s'"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:478
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
+#: plugins/addons/mailqueue/class_mailqueue.inc:98
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:508
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:508
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:174
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:578
+#: plugins/addons/addressbook/class_addressbook.inc:581
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:590
+#: plugins/addons/addressbook/class_addressbook.inc:593
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3690,49 +3725,49 @@ msgstr ""
 msgid "LDIF export"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:93
+#: plugins/addons/ldapmanager/class_csvimport.inc:96
 msgid "You've no permission to do CSV imports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:154
+#: plugins/addons/ldapmanager/class_csvimport.inc:157
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:200
+#: plugins/addons/ldapmanager/class_csvimport.inc:203
 msgid "failed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:204
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "ok"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:261
+#: plugins/addons/ldapmanager/class_csvimport.inc:264
 msgid "status"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:265
+#: plugins/addons/ldapmanager/class_csvimport.inc:268
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:290
+#: plugins/addons/ldapmanager/class_csvimport.inc:293
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:302
-#: plugins/addons/ldapmanager/class_csvimport.inc:313
-#: plugins/addons/ldapmanager/class_csvimport.inc:318
-#: plugins/addons/ldapmanager/class_import.inc:59
-#: plugins/addons/ldapmanager/class_import.inc:67
+#: plugins/addons/ldapmanager/class_csvimport.inc:305
+#: plugins/addons/ldapmanager/class_csvimport.inc:316
+#: plugins/addons/ldapmanager/class_csvimport.inc:321
+#: plugins/addons/ldapmanager/class_import.inc:62
+#: plugins/addons/ldapmanager/class_import.inc:70
 msgid "There is no file uploaded."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:307
-#: plugins/addons/ldapmanager/class_import.inc:52
+#: plugins/addons/ldapmanager/class_csvimport.inc:310
+#: plugins/addons/ldapmanager/class_import.inc:55
 msgid "The specified file is empty."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:446
+#: plugins/addons/ldapmanager/class_csvimport.inc:449
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -3792,11 +3827,11 @@ msgstr ""
 msgid "Selected Template"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:38
+#: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:105
+#: plugins/addons/ldapmanager/class_import.inc:108
 msgid "Unknown Error"
 msgstr ""
 
@@ -3808,6 +3843,7 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:10
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
 msgid "Export single entry"
 msgstr ""
 
@@ -3817,14 +3853,18 @@ msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:24
 #: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexportxls.tpl:27
+#: plugins/addons/ldapmanager/contentexportxls.tpl:42
 msgid "Choose the department you want to Export"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:36
+#: plugins/addons/ldapmanager/contentexportxls.tpl:39
 msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:55
+#: plugins/addons/ldapmanager/contentexportxls.tpl:58
 msgid "Export successful"
 msgstr ""
 
@@ -3845,14 +3885,43 @@ msgstr ""
 msgid "CSV import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:35
+#: plugins/addons/ldapmanager/class_export.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:38
 msgid "You've no permission to do LDAP exports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:80
+#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_exportxls.inc:88
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+msgid ""
+"The XLS export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as xls. You may save these files for "
+"documentation."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+msgid "Choose the data you want to Export"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+msgid "Export complete XLS for"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the complete LDAP database to a xls file"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the LDAP Export to a xls file"
+msgstr ""
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
+msgid "XLS import"
+msgstr ""
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr ""
@@ -3862,13 +3931,13 @@ msgid "No LOG servers defined!"
 msgstr ""
 
 #: plugins/addons/logview/class_logview.inc:48
-#: plugins/addons/logview/class_logview.inc:138
+#: plugins/addons/logview/class_logview.inc:141
 msgid "Can't select log database for log generation!"
 msgstr ""
 
 #: plugins/addons/logview/class_logview.inc:57
 #: plugins/addons/logview/class_logview.inc:71
-#: plugins/addons/logview/class_logview.inc:210
+#: plugins/addons/logview/class_logview.inc:213
 msgid "Query for log database failed!"
 msgstr ""
 
@@ -3904,7 +3973,7 @@ msgstr ""
 msgid "one month"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:135
+#: plugins/addons/logview/class_logview.inc:138
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 
@@ -3944,48 +4013,103 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:23
+msgid "Mail queue"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:82
+msgid "up"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:84
+msgid "down"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:89
+msgid ""
+"Please check your 'gosa.conf' the value for 'MAILQUEUE_QUERY_COMMAND' can't "
+"be executed."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
+msgid "no limit"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:117
+msgid "hours"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:9
+msgid "Please enter a search string here."
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:11
+msgid "Select a server"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:14
+msgid "within the last"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:26
+msgid "ID"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:28
+msgid "Arrival"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Recipient"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Error"
+msgstr ""
+
 #: plugins/admin/groups/class_groupGeneric.inc:115
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/class_groupGeneric.inc:164
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:269
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:269
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:269
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:267
+#: plugins/admin/groups/class_groupGeneric.inc:270
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:272
+#: plugins/admin/groups/class_groupGeneric.inc:275
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:606
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/groups/class_groupGeneric.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:526
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:616
+#: plugins/admin/groups/class_groupGeneric.inc:619
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:627
-#: plugins/admin/groups/class_groupGeneric.inc:634
+#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:637
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -4029,76 +4153,77 @@ msgid "Group administration"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:273
+#: plugins/admin/groups/class_groupManagement.inc:276
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:279
-#: plugins/admin/groups/class_groupManagement.inc:305
+#: plugins/admin/groups/class_groupManagement.inc:282
+#: plugins/admin/groups/class_groupManagement.inc:308
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/groups/class_groupManagement.inc:356
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/applications/class_applicationManagement.inc:335
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/applications/class_applicationManagement.inc:338
+#: plugins/admin/departments/class_departmentManagement.inc:295
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/groups/class_groupManagement.inc:375
+#: plugins/admin/users/class_userManagement.inc:727
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:345
-#: plugins/admin/ogroups/class_ogroupManagement.inc:481
+#: plugins/admin/groups/class_groupManagement.inc:378
+#: plugins/admin/applications/class_applicationManagement.inc:348
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/gofon/reports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/groups/class_groupManagement.inc:388
 msgid "Groupname"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/groups/class_groupManagement.inc:389
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/admin/ogroups/class_ogroupManagement.inc:393
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:391
-#: plugins/admin/applications/class_applicationManagement.inc:359
-#: plugins/admin/ogroups/class_ogroupManagement.inc:395
+#: plugins/admin/groups/class_groupManagement.inc:394
+#: plugins/admin/applications/class_applicationManagement.inc:362
+#: plugins/admin/ogroups/class_ogroupManagement.inc:398
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: plugins/admin/groups/remove.tpl:6
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for GOsa to get your data back."
@@ -4128,28 +4253,28 @@ msgstr ""
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:179
+#: plugins/admin/groups/class_groupMail.inc:182
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:244
+#: plugins/admin/groups/class_groupMail.inc:247
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:245
+#: plugins/admin/groups/class_groupMail.inc:248
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:646
+#: plugins/admin/groups/class_groupMail.inc:649
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:650
+#: plugins/admin/groups/class_groupMail.inc:653
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -4190,11 +4315,11 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:54
+#: plugins/admin/groups/class_groupAcl.inc:58
 msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:199
+#: plugins/admin/groups/class_groupAcl.inc:203
 msgid "All fields are writeable"
 msgstr ""
 
@@ -4250,39 +4375,39 @@ msgstr ""
 msgid "Folder administrators"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:61
+#: plugins/admin/groups/class_groupApplication.inc:64
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:69
+#: plugins/admin/groups/class_groupApplication.inc:72
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:70
+#: plugins/admin/groups/class_groupApplication.inc:73
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:72
+#: plugins/admin/groups/class_groupApplication.inc:75
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:73
+#: plugins/admin/groups/class_groupApplication.inc:76
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:107
+#: plugins/admin/groups/class_groupApplication.inc:110
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:143
+#: plugins/admin/groups/class_groupApplication.inc:146
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:278
+#: plugins/admin/groups/class_groupApplication.inc:281
 #, php-format
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
@@ -4301,18 +4426,18 @@ msgstr ""
 #: plugins/admin/users/template.tpl:6
 msgid ""
 "Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
 msgstr ""
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:996
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:1013
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Template"
 msgstr ""
 
 #: plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:387
+#: plugins/admin/fai/class_faiManagement.inc:390
 #: plugins/admin/fai/faiPackageNew.tpl:65
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4330,57 +4455,58 @@ msgid "User administration"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:80
+#: plugins/admin/systems/printer.tpl:65 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:244
-#: plugins/admin/users/class_userManagement.inc:314
+#: plugins/admin/users/class_userManagement.inc:247
+#: plugins/admin/users/class_userManagement.inc:317
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:353
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:387
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:488
 #: plugins/admin/systems/class_workstationStartup.inc:49
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:235
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:558
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:681
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
@@ -4388,59 +4514,59 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/users/class_userManagement.inc:694
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:730
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:732
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:734
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:719
+#: plugins/admin/users/class_userManagement.inc:736
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:721
+#: plugins/admin/users/class_userManagement.inc:738
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:740
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:795
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:785
+#: plugins/admin/users/class_userManagement.inc:802
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
+#: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
 "this user. Please double check if your really want to do this since there is "
@@ -4508,7 +4634,7 @@ msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:354
+#: plugins/admin/applications/class_applicationManagement.inc:357
 msgid "Application name"
 msgstr ""
 
@@ -4566,50 +4692,47 @@ msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Upload"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:85
-msgid "Create template"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
+#: plugins/admin/applications/class_applicationParameters.inc:50
 msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:48
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
+#: plugins/admin/applications/class_applicationParameters.inc:53
 msgid "Create options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/applications/class_applicationParameters.inc:54
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/admin/applications/class_applicationParameters.inc:90
 msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/admin/applications/class_applicationParameters.inc:90
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/admin/applications/class_applicationParameters.inc:101
 msgid "Add option"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
+#: plugins/admin/applications/class_applicationParameters.inc:152
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
+#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -4639,50 +4762,54 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
+#: plugins/admin/applications/class_applicationManagement.inc:250
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
+#: plugins/admin/applications/class_applicationManagement.inc:256
+#: plugins/admin/applications/class_applicationManagement.inc:282
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/applications/class_applicationManagement.inc:330
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:103
+#: plugins/admin/applications/class_applicationGeneric.inc:82
+msgid "no example"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:100
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:219
+#: plugins/admin/applications/class_applicationGeneric.inc:216
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:300
+#: plugins/admin/applications/class_applicationGeneric.inc:297
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:305
+#: plugins/admin/applications/class_applicationGeneric.inc:302
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:309
+#: plugins/admin/applications/class_applicationGeneric.inc:306
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:313
+#: plugins/admin/applications/class_applicationGeneric.inc:310
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:322
+#: plugins/admin/applications/class_applicationGeneric.inc:319
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
@@ -4740,20 +4867,20 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:7
-#: plugins/gofon/conference/remove.tpl:7
+#: plugins/admin/departments/remove.tpl:6
+#: plugins/gofon/conference/remove.tpl:6
 msgid ""
-"This includes <b>all</b> accounts, systems, etc. in this subtree. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"This includes 'all' accounts, systems, etc. in this subtree. Please double "
+"check if your really want to do this since there is no way for GOsa to get "
+"your data back."
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:11 plugins/admin/systems/remove.tpl:11
-#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:11
+#: plugins/admin/departments/remove.tpl:10 plugins/admin/systems/remove.tpl:10
+#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
-"<i>Delete</i> to continue or <i>Cancel</i> to abort."
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
 #: plugins/admin/departments/headpage.tpl:6
@@ -4781,103 +4908,103 @@ msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:185
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:175
+#: plugins/admin/departments/class_departmentManagement.inc:188
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:178
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:202
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:192
+#: plugins/admin/departments/class_departmentManagement.inc:205
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:426
 msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/departments/class_departmentManagement.inc:284
 msgid "Create new department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/departments/class_departmentManagement.inc:292
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/departments/class_departmentManagement.inc:301
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:316
-#: plugins/admin/fai/class_faiManagement.inc:492
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/fai/class_faiManagement.inc:495
 msgid "department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:393
+#: plugins/admin/departments/class_departmentManagement.inc:395
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:143
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:147
-#: plugins/admin/departments/class_departmentGeneric.inc:149
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+#: plugins/admin/departments/class_departmentGeneric.inc:152
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/admin/departments/class_departmentGeneric.inc:160
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:162
+#: plugins/admin/departments/class_departmentGeneric.inc:165
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:163
+#: plugins/admin/departments/class_departmentGeneric.inc:166
 msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
-#: plugins/admin/systems/class_terminalInfo.inc:178
+#: plugins/admin/systems/class_terminalInfo.inc:181
 msgid "present"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:62
-#: plugins/admin/systems/class_terminalService.inc:136
-#: plugins/admin/systems/class_terminalStartup.inc:96
-#: plugins/admin/systems/class_terminalGeneric.inc:127
-#: plugins/admin/systems/class_workstationService.inc:121
-#: plugins/admin/systems/class_workstationStartup.inc:212
+#: plugins/admin/systems/class_terminalInfo.inc:65
+#: plugins/admin/systems/class_terminalService.inc:139
+#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:130
+#: plugins/admin/systems/class_workstationService.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:215
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:69
+#: plugins/admin/systems/class_terminalInfo.inc:72
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:92
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:152
+#: plugins/admin/systems/class_terminalInfo.inc:155
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_terminalInfo.inc:173
 msgid "offline"
 msgstr ""
 
@@ -4893,32 +5020,32 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:259
+#: plugins/admin/systems/class_servService.inc:264
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:51
 msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
+#: plugins/admin/systems/class_winGeneric.inc:142
+#: plugins/admin/systems/class_componentGeneric.inc:113
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
+#: plugins/admin/systems/class_winGeneric.inc:156
+#: plugins/admin/systems/class_componentGeneric.inc:126
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:257
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:211
-#: plugins/admin/systems/class_printGeneric.inc:426
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
+#: plugins/admin/systems/class_winGeneric.inc:166
+#: plugins/admin/systems/class_terminalGeneric.inc:260
+#: plugins/admin/systems/class_servGeneric.inc:183
+#: plugins/admin/systems/class_workstationGeneric.inc:214
+#: plugins/admin/systems/class_printGeneric.inc:445
+#: plugins/admin/systems/class_componentGeneric.inc:136
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -5057,6 +5184,10 @@ msgstr ""
 msgid "Print Service"
 msgstr ""
 
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalService.inc:83
 #: plugins/admin/systems/class_workstationService.inc:68
 msgid "default"
@@ -5087,49 +5218,49 @@ msgstr ""
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:184
-#: plugins/admin/systems/class_workstationService.inc:168
+#: plugins/admin/systems/class_terminalService.inc:187
+#: plugins/admin/systems/class_workstationService.inc:171
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:233
-#: plugins/admin/systems/class_workstationService.inc:238
+#: plugins/admin/systems/class_terminalService.inc:251
+#: plugins/admin/systems/class_terminalService.inc:256
+#: plugins/admin/systems/class_workstationService.inc:236
+#: plugins/admin/systems/class_workstationService.inc:241
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:248
-#: plugins/admin/systems/class_workstationService.inc:253
+#: plugins/admin/systems/class_terminalService.inc:266
+#: plugins/admin/systems/class_terminalService.inc:271
+#: plugins/admin/systems/class_workstationService.inc:251
+#: plugins/admin/systems/class_workstationService.inc:256
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:157
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:168
+#: plugins/admin/systems/class_servDB.inc:134
+#: plugins/admin/systems/class_servDB.inc:150
+#: plugins/admin/systems/class_servDB.inc:160
+#: plugins/admin/systems/class_servDB.inc:165
+#: plugins/admin/systems/class_servDB.inc:171
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:137
+#: plugins/admin/systems/class_servDB.inc:140
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
+#: plugins/admin/systems/class_servDB.inc:144
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servDB.inc:155
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:179
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
@@ -5139,7 +5270,7 @@ msgid "Server name"
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:31
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/workstation.tpl:29
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
@@ -5228,94 +5359,94 @@ msgstr ""
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:89
-#: plugins/admin/systems/class_servGeneric.inc:59
-#: plugins/admin/ogroups/class_termgroup.inc:59
+#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:62
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:93
-#: plugins/admin/systems/class_terminalGeneric.inc:105
-#: plugins/admin/systems/class_terminalGeneric.inc:117
-#: plugins/admin/systems/class_servGeneric.inc:63
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/systems/class_servGeneric.inc:87
-#: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:63
-#: plugins/admin/ogroups/class_termgroup.inc:75
-#: plugins/admin/ogroups/class_termgroup.inc:87
+#: plugins/admin/systems/class_terminalGeneric.inc:96
+#: plugins/admin/systems/class_terminalGeneric.inc:108
+#: plugins/admin/systems/class_terminalGeneric.inc:120
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/systems/class_workstationGeneric.inc:101
+#: plugins/admin/ogroups/class_termgroup.inc:66
+#: plugins/admin/ogroups/class_termgroup.inc:78
+#: plugins/admin/ogroups/class_termgroup.inc:90
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:101
-#: plugins/admin/systems/class_servGeneric.inc:71
-#: plugins/admin/ogroups/class_termgroup.inc:71
+#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:74
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:113
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/ogroups/class_termgroup.inc:83
+#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:86
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:123
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:123
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:146
-#: plugins/admin/systems/class_servGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:128
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:149
+#: plugins/admin/systems/class_servGeneric.inc:117
+#: plugins/admin/systems/class_workstationGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:240
+#: plugins/admin/systems/class_terminalGeneric.inc:243
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:244
+#: plugins/admin/systems/class_terminalGeneric.inc:247
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:49
+#: plugins/admin/systems/class_servGeneric.inc:52
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:166
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:173
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:39
 msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_servDHCP.inc:40
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
@@ -5325,54 +5456,52 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:14
+#: plugins/admin/systems/printer.tpl:9
 msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:30
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/printer.tpl:33
+msgid "Printer location"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:37
 msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:61
-msgid "PPD"
+#: plugins/admin/systems/printer.tpl:45
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/printer.tpl:57
 msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:79
-msgid "Following objects are assigned as user."
+#: plugins/admin/systems/printer.tpl:64
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:83
+#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
 msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:84
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
 msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:96
-msgid "Following objects are assigned as admin."
+#: plugins/admin/systems/printer.tpl:80
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:97
+#: plugins/admin/systems/printer.tpl:81
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:100
-msgid "Add admin user"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:101
-msgid "Add admin group"
-msgstr ""
-
 #: plugins/admin/systems/class_workstationGeneric.inc:68
 msgid "Activated"
 msgstr ""
@@ -5385,32 +5514,32 @@ msgstr ""
 msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:94
+#: plugins/admin/systems/class_workstationGeneric.inc:97
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:106
+#: plugins/admin/systems/class_workstationGeneric.inc:109
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationGeneric.inc:127
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:125
-#: plugins/admin/systems/class_workstationGeneric.inc:129
+#: plugins/admin/systems/class_workstationGeneric.inc:128
+#: plugins/admin/systems/class_workstationGeneric.inc:132
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/systems/class_workstationGeneric.inc:129
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:197
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/systems/class_workstationGeneric.inc:201
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
@@ -5418,247 +5547,248 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:331
+#: plugins/admin/systems/class_systemManagement.inc:334
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:347
+#: plugins/admin/systems/class_systemManagement.inc:350
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:360
+#: plugins/admin/systems/class_systemManagement.inc:363
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:404
+#: plugins/admin/systems/class_systemManagement.inc:407
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:410
-#: plugins/admin/systems/class_systemManagement.inc:474
-#: plugins/admin/fai/class_faiManagement.inc:207
-#: plugins/admin/fai/class_faiManagement.inc:246
+#: plugins/admin/systems/class_systemManagement.inc:413
+#: plugins/admin/systems/class_systemManagement.inc:477
+#: plugins/admin/fai/class_faiManagement.inc:210
+#: plugins/admin/fai/class_faiManagement.inc:249
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/systems/class_systemManagement.inc:569
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:711
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:712
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:572
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:573
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:574
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:579
+#: plugins/admin/systems/class_systemManagement.inc:582
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:583
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:586
+#: plugins/admin/systems/class_systemManagement.inc:589
 msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/fai/class_faiManagement.inc:462
+#: plugins/admin/systems/class_systemManagement.inc:593
+#: plugins/admin/fai/class_faiManagement.inc:465
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:626
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:628
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:627
+#: plugins/admin/systems/class_systemManagement.inc:630
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:628
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:629
+#: plugins/admin/systems/class_systemManagement.inc:632
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:630
+#: plugins/admin/systems/class_systemManagement.inc:633
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:631
+#: plugins/admin/systems/class_systemManagement.inc:634
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:632
+#: plugins/admin/systems/class_systemManagement.inc:635
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:658
+#: plugins/admin/systems/class_systemManagement.inc:661
 msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:704
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/ogroups/class_ogroupManagement.inc:489
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:705
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/ogroups/class_ogroupManagement.inc:488
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:713
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:711
+#: plugins/admin/systems/class_systemManagement.inc:714
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:931
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:934
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:948
+#: plugins/admin/systems/class_systemManagement.inc:951
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:960
+#: plugins/admin/systems/class_systemManagement.inc:963
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:205
-#: plugins/admin/systems/class_printGeneric.inc:208
+#: plugins/admin/systems/class_printGeneric.inc:189
+#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:213
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
+#: plugins/admin/systems/class_printGeneric.inc:190
 msgid ""
 "This workstation has printer extension disabled. You can't enable it while "
 "'cn' is not present in entry. Possibly you are currently creating a new "
 "terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:197
-#: plugins/admin/systems/class_printGeneric.inc:200
+#: plugins/admin/systems/class_printGeneric.inc:202
+#: plugins/admin/systems/class_printGeneric.inc:205
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:198
+#: plugins/admin/systems/class_printGeneric.inc:203
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:201
+#: plugins/admin/systems/class_printGeneric.inc:206
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:206
+#: plugins/admin/systems/class_printGeneric.inc:211
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:214
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:220
+#: plugins/admin/systems/class_printGeneric.inc:225
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:341
-msgid "Undefined"
+#: plugins/admin/systems/class_printGeneric.inc:355
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:371
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:354
+#: plugins/admin/systems/class_printGeneric.inc:373
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:416
+#: plugins/admin/systems/class_printGeneric.inc:435
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:539
-#: plugins/admin/systems/class_printGeneric.inc:541
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/systems/class_printGeneric.inc:562
+#: plugins/admin/systems/class_printGeneric.inc:564
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:33
+#: plugins/admin/systems/class_servDNS.inc:36
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:34
+#: plugins/admin/systems/class_servDNS.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_servDNS.inc:39
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:37
+#: plugins/admin/systems/class_servDNS.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
@@ -5731,61 +5861,61 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servKolab.inc:146
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:149
+#: plugins/admin/systems/class_servKolab.inc:152
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:221
+#: plugins/admin/systems/class_servKolab.inc:224
 msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:223
+#: plugins/admin/systems/class_servKolab.inc:226
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
+#: plugins/admin/systems/class_servKolab.inc:230
 msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
+#: plugins/admin/systems/class_servKolab.inc:232
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:231
+#: plugins/admin/systems/class_servKolab.inc:234
 msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
+#: plugins/admin/systems/class_servKolab.inc:238
 msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:239
+#: plugins/admin/systems/class_servKolab.inc:242
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
@@ -5869,7 +5999,7 @@ msgstr ""
 msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:7
+#: plugins/admin/systems/remove.tpl:6
 msgid ""
 "This includes <b>all</b> system and setup informations. Please double check "
 "if your really want to do this since there is no way for GOsa to get your "
@@ -5951,33 +6081,36 @@ msgstr ""
 msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59 plugins/admin/systems/headpage.tpl:60
+#: plugins/admin/systems/headpage.tpl:59
 msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:63
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/class_componentGeneric.inc:116
 #: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'MAC-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:119
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
@@ -6023,48 +6156,48 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:102
+#: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/admin/systems/class_phoneGeneric.inc:177
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/admin/systems/class_phoneGeneric.inc:177
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:213
+#: plugins/admin/systems/class_phoneGeneric.inc:216
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:270
+#: plugins/admin/systems/class_phoneGeneric.inc:273
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
+#: plugins/admin/systems/class_phoneGeneric.inc:276
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
+#: plugins/admin/systems/class_phoneGeneric.inc:285
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:289
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
@@ -6150,6 +6283,7 @@ msgid "Keyboard"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/printerPPDDialog.tpl:5
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
 msgid "Model"
@@ -6213,11 +6347,6 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -6278,27 +6407,27 @@ msgstr ""
 msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:101
+#: plugins/admin/systems/class_servNfs.inc:104
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:107
+#: plugins/admin/systems/class_servNfs.inc:110
 msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:110
+#: plugins/admin/systems/class_servNfs.inc:113
 msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:115
+#: plugins/admin/systems/class_servNfs.inc:118
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:119
+#: plugins/admin/systems/class_servNfs.inc:122
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:123
+#: plugins/admin/systems/class_servNfs.inc:126
 msgid "Option contains invalid characters."
 msgstr ""
 
@@ -6318,94 +6447,121 @@ msgstr ""
 msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:2
-msgid "Printer driver information file setup"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:7
-msgid "Current used information setup: "
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:13
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
 msgid "Select"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
-msgid "Select entry"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
-msgid "Select user/group to add"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
 msgid ""
-"This menu allows you to select one or multiple users or groups to add them "
-"to the printer. \n"
-"\t\t\t\t\t\t\tHaving a great number of users, you may want to use the range "
-"selectors on top of this list."
+"This menu allows you to select one or multiple entries to be added to the "
+"printer object for specific tasks. Having a great number of entries, you may "
+"want to use the range selectors below."
 msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
 msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
 msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
 msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:232
-#: plugins/admin/systems/class_printerPPDDialog.inc:235
-msgid "True"
+#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:233
-#: plugins/admin/systems/class_printerPPDDialog.inc:236
-msgid "False"
+#: plugins/admin/systems/class_printerPPDDialog.inc:103
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:241
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
 #, php-format
-msgid "Unsupported PPD type '%s' used for '%s' "
+msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
-msgid "Reset list"
+#: plugins/admin/systems/class_printerPPDDialog.inc:123
+#, php-format
+msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:87
-msgid "Upload PPD"
+#: plugins/admin/systems/class_printerPPDDialog.inc:139
+#: plugins/admin/systems/class_printerPPDDialog.inc:142
+msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:92
-msgid "List with all available ppd files."
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+msgid "Please select a valid ppd."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
-msgid "Entries"
+#: plugins/admin/systems/class_printerPPDDialog.inc:273
+#: plugins/admin/fai/faiPackage.tpl:41
+msgid "Section"
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:323
+#: plugins/admin/systems/class_printerPPDDialog.inc:326
+msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:117
-msgid "selected"
+#: plugins/admin/systems/class_printerPPDDialog.inc:324
+#: plugins/admin/systems/class_printerPPDDialog.inc:327
+msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
-msgid "Please select a PPD or press cancel"
+#: plugins/admin/systems/class_printerPPDDialog.inc:332
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-msgid "List of PPDs"
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/fai/faiProfileEntry.tpl:55
+#: plugins/admin/fai/faiProfileEntry.tpl:56 plugins/admin/fai/headpage.tpl:47
+#: plugins/admin/fai/faiPackageEntry.tpl:50
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:45
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/fai/faiProfileEntry.tpl:60 plugins/admin/fai/headpage.tpl:51
+#: plugins/admin/fai/faiPackageEntry.tpl:55
+msgid "Regular expression for matching object names"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationStartup.inc:197
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:248
+#: plugins/admin/systems/class_workstationStartup.inc:251
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configuratons."
@@ -6548,19 +6704,15 @@ msgid "use debug mode for startup"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:148
+#: plugins/admin/ogroups/tabs_ogroups.inc:151
 msgid "Phone queue"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:84
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:131
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr ""
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -6613,23 +6765,6 @@ msgstr ""
 msgid "Select to see phones"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiProfileEntry.tpl:56 plugins/admin/fai/headpage.tpl:47
-#: plugins/admin/fai/faiPackageEntry.tpl:50
-msgid "Display objects matching"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/fai/faiProfileEntry.tpl:60 plugins/admin/fai/headpage.tpl:51
-#: plugins/admin/fai/faiPackageEntry.tpl:55
-msgid "Regular expression for matching object names"
-msgstr ""
-
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -6641,63 +6776,59 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:124
+#: plugins/admin/ogroups/class_ogroup.inc:127
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:234
+#: plugins/admin/ogroups/class_ogroup.inc:237
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:236
+#: plugins/admin/ogroups/class_ogroup.inc:239
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:237
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:238
+#: plugins/admin/ogroups/class_ogroup.inc:241
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:239
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/ogroups/class_ogroup.inc:243
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:241
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:245
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:243
+#: plugins/admin/ogroups/class_ogroup.inc:246
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:251
+#: plugins/admin/ogroups/class_ogroup.inc:254
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:405
 msgid "Non existing dn: "
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:533
-msgid "Object groups need at least one member!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:538
+#: plugins/admin/ogroups/class_ogroup.inc:536
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
@@ -6710,7 +6841,9 @@ msgstr ""
 msgid "UNIX accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
 msgid "Servers"
 msgstr ""
 
@@ -6722,25 +6855,25 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#: plugins/admin/ogroups/class_ogroupManagement.inc:218
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+#: plugins/admin/ogroups/class_ogroupManagement.inc:224
+#: plugins/admin/ogroups/class_ogroupManagement.inc:250
 msgid "You are not allowed to delete this object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/admin/ogroups/class_ogroupManagement.inc:441
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -6810,12 +6943,12 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
+#: plugins/admin/ogroups/class_mailogroup.inc:41
 msgid ""
 "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
@@ -6844,103 +6977,99 @@ msgstr ""
 msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:110
+#: plugins/admin/ogroups/class_phonequeue.inc:113
 msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:111
+#: plugins/admin/ogroups/class_phonequeue.inc:114
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:116
 msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
+#: plugins/admin/ogroups/class_phonequeue.inc:117
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:161
-msgid "Uruguai"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:199
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:214
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:244
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-#: plugins/gofon/macro/class_gofonMacro.inc:88
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:222
+#: plugins/admin/ogroups/class_phonequeue.inc:228
 msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer).\n"
-"Your Settings can't be saved to asterisk Database."
+"There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:239
-#: plugins/admin/ogroups/class_phonequeue.inc:613
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:77
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:283
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
-#: plugins/gofon/macro/class_gofonMacro.inc:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:343
+#: plugins/admin/ogroups/class_phonequeue.inc:241
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
 #, php-format
 msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:249
-#: plugins/admin/ogroups/class_phonequeue.inc:623
+#: plugins/admin/ogroups/class_phonequeue.inc:251
+#: plugins/admin/ogroups/class_phonequeue.inc:625
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#: plugins/gofon/macro/class_gofonMacro.inc:199
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:354
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/macro/class_gofonMacro.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:248
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:280
-#: plugins/admin/ogroups/class_phonequeue.inc:494
-#: plugins/admin/ogroups/class_phonequeue.inc:659
+#: plugins/admin/ogroups/class_phonequeue.inc:282
+#: plugins/admin/ogroups/class_phonequeue.inc:496
+#: plugins/admin/ogroups/class_phonequeue.inc:661
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:524
 #: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:396
+#: plugins/admin/ogroups/class_phonequeue.inc:528
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1134
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1136
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:399
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:77
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:283
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1022
+#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
 #: plugins/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
 msgstr ""
@@ -7068,8 +7197,8 @@ msgstr ""
 
 #: plugins/admin/fai/remove.tpl:7
 msgid ""
-"This includes <b>all</b> object informations. Please double check if your "
-"really want to do this since there is no way for GOsa to get your data back."
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
@@ -7084,102 +7213,102 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:201
+#: plugins/admin/fai/class_faiManagement.inc:204
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/admin/fai/class_faiManagement.inc:431
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/admin/fai/class_faiManagement.inc:431
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:436
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:436
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:442
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:442
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:445
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:445
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:448
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:448
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:451
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:451
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:466
+#: plugins/admin/fai/class_faiManagement.inc:469
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:467
+#: plugins/admin/fai/class_faiManagement.inc:470
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/admin/fai/class_faiManagement.inc:474
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:472
+#: plugins/admin/fai/class_faiManagement.inc:475
 msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:514
-#: plugins/admin/fai/class_faiManagement.inc:515
-#: plugins/admin/fai/class_faiProfile.inc:157
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiManagement.inc:517
+#: plugins/admin/fai/class_faiManagement.inc:518
+#: plugins/admin/fai/class_faiProfile.inc:161
+#: plugins/admin/fai/class_faiProfileEntry.inc:123
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:521
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:524
+#: plugins/admin/fai/class_faiManagement.inc:525
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:528
-#: plugins/admin/fai/class_faiManagement.inc:529
+#: plugins/admin/fai/class_faiManagement.inc:531
+#: plugins/admin/fai/class_faiManagement.inc:532
 msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:549
-#: plugins/admin/fai/class_faiManagement.inc:550
+#: plugins/admin/fai/class_faiManagement.inc:552
+#: plugins/admin/fai/class_faiManagement.inc:553
 msgid "Profile"
 msgstr ""
 
@@ -7251,24 +7380,24 @@ msgstr ""
 msgid "Choose a variable to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:48
-#: plugins/admin/fai/class_faiHookEntry.inc:51
+#: plugins/admin/fai/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiHookEntry.inc:54
 msgid "Please select a valid file."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
+#: plugins/admin/fai/class_faiScriptEntry.inc:54
+#: plugins/admin/fai/class_faiHookEntry.inc:57
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:95
-#: plugins/admin/fai/class_faiVariableEntry.inc:83
-#: plugins/admin/fai/class_faiHookEntry.inc:100
-#: plugins/admin/fai/class_faiTemplateEntry.inc:161
+#: plugins/admin/fai/class_faiScriptEntry.inc:99
+#: plugins/admin/fai/class_faiVariableEntry.inc:86
+#: plugins/admin/fai/class_faiHookEntry.inc:104
+#: plugins/admin/fai/class_faiTemplateEntry.inc:164
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:99
+#: plugins/admin/fai/class_faiScriptEntry.inc:103
 msgid "Please enter a script."
 msgstr ""
 
@@ -7286,24 +7415,24 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:117
+#: plugins/admin/fai/class_faiPackage.inc:121
 msgid "There is no useable package list defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:254
+#: plugins/admin/fai/class_faiPackage.inc:259
 #, php-format
 msgid "Can't read configuration folder '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:336
+#: plugins/admin/fai/class_faiPackage.inc:341
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:345
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:371
+#: plugins/admin/fai/class_faiPackage.inc:376
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
@@ -7316,10 +7445,6 @@ msgstr ""
 msgid "Release"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:41
-msgid "Section"
-msgstr ""
-
 #: plugins/admin/fai/faiPackage.tpl:50
 msgid "Mirror"
 msgstr ""
@@ -7340,52 +7465,52 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:141
-#: plugins/admin/fai/class_faiProfileEntry.inc:148
+#: plugins/admin/fai/class_faiProfile.inc:145
+#: plugins/admin/fai/class_faiProfileEntry.inc:151
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:149
+#: plugins/admin/fai/class_faiProfile.inc:153
 msgid "Append new class names"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:152
-#: plugins/admin/fai/class_faiProfileEntry.inc:115
+#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfileEntry.inc:118
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:153
-#: plugins/admin/fai/class_faiProfileEntry.inc:116
+#: plugins/admin/fai/class_faiProfile.inc:157
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:154
-#: plugins/admin/fai/class_faiProfileEntry.inc:117
+#: plugins/admin/fai/class_faiProfile.inc:158
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:155
-#: plugins/admin/fai/class_faiProfileEntry.inc:118
+#: plugins/admin/fai/class_faiProfile.inc:159
+#: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfile.inc:160
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:159
+#: plugins/admin/fai/class_faiProfile.inc:163
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:222
+#: plugins/admin/fai/class_faiProfile.inc:226
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:226
+#: plugins/admin/fai/class_faiProfile.inc:230
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:234
+#: plugins/admin/fai/class_faiProfile.inc:238
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
@@ -7425,27 +7550,27 @@ msgstr ""
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:177
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:178
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 msgid "Preserve"
 msgstr ""
 
@@ -7495,7 +7620,7 @@ msgstr ""
 msgid "Choose a script to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:79
+#: plugins/admin/fai/class_faiVariableEntry.inc:82
 msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
@@ -7515,17 +7640,23 @@ msgstr ""
 msgid "Choose a template to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:216
-#: plugins/admin/fai/class_faiPartitionTable.inc:218
+#: plugins/admin/fai/class_faiPartitionTable.inc:222
+#: plugins/admin/fai/class_faiPartitionTable.inc:228
+#, php-format
+msgid "%s partition"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:224
+#: plugins/admin/fai/class_faiPartitionTable.inc:230
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:96
+#: plugins/admin/fai/class_faiHookEntry.inc:100
 msgid "Please enter a value for script."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Package bundle"
 msgstr ""
 
@@ -7538,46 +7669,46 @@ msgid "Task"
 msgstr ""
 
 #: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose a FAI task to hook"
+msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:68
+#: plugins/admin/fai/class_askClassName.inc:71
 msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:69
+#: plugins/admin/fai/class_askClassName.inc:72
 msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:70
+#: plugins/admin/fai/class_askClassName.inc:73
 msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:71
+#: plugins/admin/fai/class_askClassName.inc:74
 msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:75
 msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:76
 msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:126
+#: plugins/admin/fai/class_askClassName.inc:129
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:130
+#: plugins/admin/fai/class_askClassName.inc:133
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -7617,40 +7748,40 @@ msgid "Use"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:74
-msgid "A new class name.</b>"
+msgid "A new class name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:71
+#: plugins/admin/fai/class_faiTemplateEntry.inc:74
 msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:73
+#: plugins/admin/fai/class_faiTemplateEntry.inc:76
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:153
+#: plugins/admin/fai/class_faiTemplateEntry.inc:156
 msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:157
+#: plugins/admin/fai/class_faiTemplateEntry.inc:160
 msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:165
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
 msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:168
-msgid "Please enter a valid user. Only a-Z 0-9 are allowed."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:171
+msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:172
+#: plugins/admin/fai/class_faiTemplateEntry.inc:175
 msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:175
-msgid "Please enter a valid group. Only a-Z 0-9 are allowed."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
@@ -7670,7 +7801,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:316
 msgid "Owner"
 msgstr ""
 
@@ -7718,7 +7849,7 @@ msgstr ""
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:43
+#: plugins/admin/fai/class_faiPackageEntry.inc:46
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr ""
@@ -7785,92 +7916,102 @@ msgstr ""
 msgid "undefined"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:632
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:225
+msgid ""
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer). Your settings "
+"can't be saved to asterisk database."
+msgstr ""
+
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:547
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:724
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:603
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:727
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:623
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:734
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:737
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:735
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:738
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:738
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:744
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:742
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:742
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:745
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:785
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:788
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:871
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:877
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:880
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
 msgid "Phone PIN must be 4 characters long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
 msgid ""
 "The specified phone PIN contains invalid characters, only numeric values are "
 "allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:893
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:903
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:332
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1062
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1065
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1097
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1100
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
@@ -7896,15 +8037,15 @@ msgstr ""
 msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:141
+#: plugins/gofon/reports/class_fonreport.inc:144
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:145
+#: plugins/gofon/reports/class_fonreport.inc:148
 msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:154
+#: plugins/gofon/reports/class_fonreport.inc:157
 msgid "Query for phone database failed!"
 msgstr ""
 
@@ -7928,61 +8069,61 @@ msgstr ""
 msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:94
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:97
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
 msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:150
+#: plugins/gofon/macro/class_gofonMacro.inc:153
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:244
+#: plugins/gofon/macro/class_gofonMacro.inc:247
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:262
+#: plugins/gofon/macro/class_gofonMacro.inc:265
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:271
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:274
+#: plugins/gofon/macro/class_gofonMacro.inc:282
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:293
+#: plugins/gofon/macro/class_gofonMacro.inc:296
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:336
+#: plugins/gofon/macro/class_gofonMacro.inc:339
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:341
+#: plugins/gofon/macro/class_gofonMacro.inc:344
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:345
+#: plugins/gofon/macro/class_gofonMacro.inc:348
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:350
+#: plugins/gofon/macro/class_gofonMacro.inc:353
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:356
+#: plugins/gofon/macro/class_gofonMacro.inc:359
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:361
+#: plugins/gofon/macro/class_gofonMacro.inc:364
 msgid "Please choose a valid  base."
 msgstr ""
 
@@ -8033,33 +8174,33 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:242
 msgid "String"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:243
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:244
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:250
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:337
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:366
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -8070,37 +8211,37 @@ msgstr ""
 msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:251
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:282
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:346
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
 msgid "invisible"
 msgstr ""
 
@@ -8129,7 +8270,7 @@ msgstr ""
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:69
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
 msgid "Phone number"
 msgstr ""
 
@@ -8138,7 +8279,7 @@ msgid "Preset PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:314
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:317
 msgid "PIN"
 msgstr ""
 
@@ -8174,23 +8315,23 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:308
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
 msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:368
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:371
 msgid "Conference"
 msgstr ""
 
@@ -8205,29 +8346,29 @@ msgid ""
 "selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:35
+#: plugins/gofon/conference/headpage.tpl:36
 msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:191
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:192
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:195
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:199
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:200
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:203
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:204
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:207
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
@@ -8260,8 +8401,8 @@ msgstr ""
 
 #: plugins/generic/welcome/welcome.tpl:8
 msgid ""
-"Use <b>Sign out</b> on the upper left to close the connection and <b>Main</"
-"b> to get back to the pictogram view."
+"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
+"back to the pictogram view."
 msgstr ""
 
 #: plugins/generic/welcome/welcome.tpl:15
@@ -8277,7 +8418,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:313
+#: include/php_setup.inc:71 html/main.php:316
 msgid "Toggle information"
 msgstr ""
 
@@ -8459,13 +8600,17 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_pluglist.inc:98
+#: include/class_pluglist.inc:91
+msgid "plHeadline"
+msgstr ""
+
+#: include/class_pluglist.inc:115
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -8473,27 +8618,19 @@ msgid ""
 "changes?"
 msgstr ""
 
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr ""
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr ""
-
-#: include/class_plugin.inc:398
+#: include/class_plugin.inc:391
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:426 include/class_password-methods.inc:181
+#: include/class_plugin.inc:419 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:454
+#: include/class_plugin.inc:447
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -8551,19 +8688,19 @@ msgid ""
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:670
+#: include/class_ldap.inc:699
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:683
+#: include/class_ldap.inc:712
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:699
+#: include/class_ldap.inc:728
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -8592,12 +8729,29 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/functions_helpviewer.inc:43
+#, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr ""
+
+#: include/functions_helpviewer.inc:83
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:92
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:96
+msgid "next"
+msgstr ""
+
+#: include/functions_helpviewer.inc:384
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: include/functions_helpviewer.inc:459
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
@@ -8686,318 +8840,326 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr ""
 
+#: include/functions_setup.inc:231
+msgid "Support for nagios disabled, no schema seems to be installed"
+msgstr ""
+
 #: include/functions_setup.inc:236
+msgid "Support for nagios enabled"
+msgstr ""
+
+#: include/functions_setup.inc:246
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:243
+#: include/functions_setup.inc:253
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:271
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:264
+#: include/functions_setup.inc:274
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:266
+#: include/functions_setup.inc:276
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:283
+#: include/functions_setup.inc:293
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:295
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:288
+#: include/functions_setup.inc:298
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:299
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:292
+#: include/functions_setup.inc:302
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:296
+#: include/functions_setup.inc:306
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:307
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:310
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:311
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:369
+#: include/functions_setup.inc:379
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:373
+#: include/functions_setup.inc:383
 #, php-format
-msgid "Checking for function <b>%s</b>"
+msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:374
+#: include/functions_setup.inc:384
 #, php-format
 msgid ""
-"The function <b>%s</b> is used by GOsa. There is no information if it's "
-"optional or required yet."
+"The function %s is used by GOsa. There is no information if it's optional or "
+"required yet."
 msgstr ""
 
-#: include/functions_setup.inc:385
+#: include/functions_setup.inc:395
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:395
+#: include/functions_setup.inc:405
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:398
+#: include/functions_setup.inc:408
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:399
+#: include/functions_setup.inc:409
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:406
+#: include/functions_setup.inc:416
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:407
+#: include/functions_setup.inc:417
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:422
+#: include/functions_setup.inc:432
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:423
+#: include/functions_setup.inc:433
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:436
+#: include/functions_setup.inc:446
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:437
+#: include/functions_setup.inc:447
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:440
+#: include/functions_setup.inc:450
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:441
+#: include/functions_setup.inc:451
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:448
+#: include/functions_setup.inc:458
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:449
+#: include/functions_setup.inc:459
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:462
+#: include/functions_setup.inc:472
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:476
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:467
+#: include/functions_setup.inc:477
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:710
+#: include/functions_setup.inc:720
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:719 include/functions_setup.inc:802
+#: include/functions_setup.inc:729 include/functions_setup.inc:812
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:733 include/functions_setup.inc:807
-#: include/functions_setup.inc:812
+#: include/functions_setup.inc:743 include/functions_setup.inc:817
+#: include/functions_setup.inc:822
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:822
+#: include/functions_setup.inc:832
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:878
+#: include/functions_setup.inc:888
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:909
+#: include/functions_setup.inc:919
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:918
+#: include/functions_setup.inc:928
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1028 include/functions_setup.inc:1051
-#: include/functions_setup.inc:1060 html/index.php:172
+#: include/functions_setup.inc:1038 include/functions_setup.inc:1061
+#: include/functions_setup.inc:1070 html/index.php:172
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -9005,54 +9167,190 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/class_ppdManager.inc:66 include/class_ppdManager.inc:184
+#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:74
+#: include/class_ppdManager.inc:132
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:78
+#: include/class_ppdManager.inc:136
 msgid "Group name not unique!"
 msgstr ""
 
-#: include/class_ppdManager.inc:84 include/class_ppdManager.inc:114
+#: include/class_ppdManager.inc:142 include/class_ppdManager.inc:172
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:108
+#: include/class_ppdManager.inc:166
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:133
+#: include/class_ppdManager.inc:191
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:205
+#: include/class_ppdManager.inc:263
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
+#: html/helpviewer.php:113
+msgid "There is no helpfile specified for this class."
 msgstr ""
 
-#: html/helpviewer.php:85
-msgid "previous"
+#: html/helpviewer.php:221
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
-#: html/helpviewer.php:89
-msgid "next"
+#: html/getxls.php:65
+msgid "Birthday"
 msgstr ""
 
-#: html/helpviewer.php:141
-#, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Surname"
+msgstr ""
+
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Given Name"
+msgstr ""
+
+#: html/getxls.php:74 html/getxls.php:276
+msgid "User List of "
+msgstr ""
+
+#: html/getxls.php:74 html/getxls.php:104 html/getxls.php:156
+#: html/getxls.php:184 html/getxls.php:276 html/getxls.php:295
+#: html/getxls.php:314 html/getxls.php:330 html/getxls.php:349
+msgid " on "
+msgstr ""
+
+#: html/getxls.php:94 html/getxls.php:227
+msgid "Members"
+msgstr ""
+
+#: html/getxls.php:104 html/getxls.php:295
+msgid "Groups of "
+msgstr ""
+
+#: html/getxls.php:124 html/getxls.php:246
+msgid "Computers"
+msgstr ""
+
+#: html/getxls.php:133 html/getxls.php:190 html/getxls.php:336
+#: html/getxls.php:356
+msgid "Common Name"
+msgstr ""
+
+#: html/getxls.php:146
+msgid "Server Name"
+msgstr ""
+
+#: html/getxls.php:156 html/getxls.php:314
+msgid "Servers of "
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Common name"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Display Name"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Home postal address"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Mobile phone"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Postal address"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Adress"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Function"
+msgstr ""
+
+#: html/getxls.php:177 html/getxls.php:247
+msgid "Adressbook"
+msgstr ""
+
+#: html/getxls.php:184 html/getxls.php:349
+msgid "Adressbook of "
+msgstr ""
+
+#: html/getxls.php:224
+msgid "BirthDate"
+msgstr ""
+
+#: html/getxls.php:230
+msgid "Uid"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "DisplayName"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Phone Number"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Postal Adress"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Email address"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "mobile"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Organizational Unit"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Postal Address"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Postal Code"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Sn"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "st"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Title"
+msgstr ""
+
+#: html/getxls.php:239
+msgid "Full"
+msgstr ""
+
+#: html/getxls.php:330
+msgid "Computers of "
 msgstr ""
 
 #: html/getfax.php:53
@@ -9078,22 +9376,22 @@ msgid ""
 "please check existence and rights of this directory!"
 msgstr ""
 
-#: html/main.php:112
+#: html/main.php:114
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:155
+#: html/main.php:157
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:284
+#: html/main.php:287
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:316
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""