Code

Fixed white page if no mysql extension is available
[gosa.git] / locale / messages.po
index 50629ea4785aa91382b6ffb1d31e09ce783f3c33..458eb93c11f9a02026eebd9a06531a336ca1533c 100644 (file)
@@ -10,11 +10,11 @@ msgstr ""
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:66 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: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,134 +33,130 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:67
+#: contrib/gosa.conf:71
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:68 contrib/gosa.conf:80
+#: 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:726
+#: plugins/admin/groups/class_groupManagement.inc:380
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:69 contrib/gosa.conf:82
+#: 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:728
+#: 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:70 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:734
+#: 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:71 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:72 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:732
-#: plugins/admin/departments/generic.tpl:62 html/getxls.php:149
-#: html/getxls.php:206
+#: 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:73 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:730
+#: 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:74 contrib/gosa.conf:84 contrib/gosa.conf:90
-#: contrib/gosa.conf:95 contrib/gosa.conf:101 contrib/gosa.conf:110
-#: contrib/gosa.conf:119 contrib/gosa.conf:128 contrib/gosa.conf:133
-#: contrib/gosa.conf:138 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:153 contrib/gosa.conf:158
-msgid "References"
+#: contrib/gosa.conf:78 plugins/personal/nagios/class_nagiosAccount.inc:18
+msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:75 plugins/personal/nagios/class_nagiosAccount.inc:18
-msgid "Nagios"
+#: 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:81
+#: contrib/gosa.conf:85
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:83
+#: contrib/gosa.conf:87
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:89 plugins/admin/applications/generic.tpl:58
+#: contrib/gosa.conf:93 plugins/admin/applications/generic.tpl:75
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:100 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
+#: contrib/gosa.conf:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:640
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:106 contrib/gosa.conf:124
+#: contrib/gosa.conf:110 contrib/gosa.conf:128
 #: plugins/admin/ogroups/tabs_ogroups.inc:93
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:107 contrib/gosa.conf:125
+#: contrib/gosa.conf:111 contrib/gosa.conf:129
 #: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:108 contrib/gosa.conf:126
+#: 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:109 contrib/gosa.conf:118 contrib/gosa.conf:127
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/generic.tpl:67
+#: contrib/gosa.conf:113 contrib/gosa.conf:122 contrib/gosa.conf:131
+#: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/ogroups/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
 #: plugins/admin/fai/faiProfileEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
@@ -168,15 +164,15 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:115
+#: contrib/gosa.conf:119
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:116 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:170 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
@@ -185,86 +181,86 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:171
+#: contrib/gosa.conf:178
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:172 plugins/personal/mail/generic.tpl:112
+#: 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
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
-#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/generic.tpl:100
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:181 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:81
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:98
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:542
-#: plugins/admin/fai/class_faiManagement.inc:543
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:551
+#: plugins/admin/fai/class_faiManagement.inc:552
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:535
-#: plugins/admin/fai/class_faiManagement.inc:536
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:544
+#: plugins/admin/fai/class_faiManagement.inc:545
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:193 plugins/admin/fai/class_faiManagement.inc:556
-#: plugins/admin/fai/class_faiManagement.inc:557
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:565
+#: plugins/admin/fai/class_faiManagement.inc:566
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:197 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:217
+#: contrib/gosa.conf:226
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:234 plugins/admin/ogroups/class_phonequeue.inc:161
+#: contrib/gosa.conf:243 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:235
+#: contrib/gosa.conf:244
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:245
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:237
+#: contrib/gosa.conf:246
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:247
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:239
+#: contrib/gosa.conf:248
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:240
+#: contrib/gosa.conf:249
 msgid "Italian"
 msgstr ""
 
@@ -281,6 +277,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_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -293,6 +292,7 @@ msgstr ""
 #: 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
@@ -315,98 +315,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:693
 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:698
+#: plugins/admin/groups/class_groupMail.inc:614
 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:706
+#: 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:713
+#: plugins/admin/groups/class_groupMail.inc:623
+#: 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:719
+#: plugins/admin/groups/class_groupMail.inc:629
 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:728
+#: plugins/admin/groups/class_groupMail.inc:638
 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:738
+#: plugins/admin/groups/class_groupMail.inc:646
 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:742
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
@@ -415,9 +415,10 @@ msgstr ""
 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/personal/mail/generic.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:32 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -431,8 +432,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_printGeneric.inc:353
+#: plugins/admin/systems/class_terminalInfo.inc:150
+#: plugins/admin/systems/class_printGeneric.inc:367
 msgid "not defined"
 msgstr ""
 
@@ -440,13 +441,13 @@ msgstr ""
 msgid "Quota size"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:44
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:45
+#: plugins/admin/systems/phonesettings.tpl:170
+#: plugins/admin/systems/phonesettings.tpl:185
 msgid "List of alternative mail addresses"
 msgstr ""
 
@@ -458,38 +459,39 @@ 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/hotplugDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: 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/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/gofax/faxaccount/generic.tpl:76
+#: plugins/gofax/faxaccount/locals.tpl:60
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
+#: plugins/admin/groups/class_groupMail.inc:408
+#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/groups/generic.tpl:103
+#: plugins/admin/groups/mail_locals.tpl:66
 #: 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:70
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:73
 #: plugins/admin/systems/workstationStartup.tpl:92
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/generic.tpl:39
 #: 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:150
+#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:74
+#: 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
@@ -505,30 +507,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/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/gofax/blocklists/remove.tpl:14
+#: plugins/gofax/faxaccount/generic.tpl:78
+#: plugins/gofax/faxaccount/lists.tpl:14
+#: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:52
+#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:105 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:70 plugins/admin/systems/printer.tpl:86
-#: plugins/admin/systems/remove.tpl:15
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
+#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
 #: 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:40 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 ""
 
@@ -575,7 +577,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 ""
@@ -589,7 +591,7 @@ msgid "Forward messages to"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:129
-#: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
+#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 msgid "Add local"
 msgstr ""
 
@@ -620,18 +622,18 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:115
 #: plugins/personal/environment/main.inc:104
 #: plugins/personal/nagios/main.inc:104
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:629
-#: 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:390
 #: 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 ""
 
@@ -646,40 +648,40 @@ msgstr ""
 #: plugins/personal/generic/main.inc:160
 #: 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/hotplugDialog.tpl:64
+#: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: 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/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/gofax/blocklists/generic.tpl:82
+#: plugins/gofax/blocklists/remove.tpl:16
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:33 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/group_objects.tpl:49
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:631
-#: 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/printerPPDDialog.tpl:23
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: 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:392
+#: plugins/admin/fai/class_faiManagement.inc:397
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 #: plugins/admin/fai/faiProfileEntry.tpl:72
 #: plugins/admin/fai/faiScriptEntry.tpl:68
@@ -688,10 +690,10 @@ msgstr ""
 #: 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 ""
@@ -711,8 +713,8 @@ msgstr ""
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/nagios/main.inc:115
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/generic.tpl:86
+#: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/printer.tpl:46
@@ -735,8 +737,8 @@ msgstr ""
 #: plugins/personal/mail/mail_locals.tpl:20
 #: 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/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
@@ -746,8 +748,8 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
 #: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:32
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
+#: plugins/admin/systems/selectUserToPrinterDialog.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
@@ -757,49 +759,39 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
 #: plugins/personal/mail/mail_locals.tpl:27
 #: 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/gofax/faxaccount/locals.tpl:31
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
 #: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
+#: plugins/admin/groups/group_objects.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 msgid "Choose the department the search will be based on"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr ""
-
 #: plugins/personal/mail/mail_locals.tpl:31
 #: plugins/personal/posix/trust_machines.tpl:31
 #: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
+#: plugins/admin/groups/mail_locals.tpl:45
 msgid "Regular expression for matching addresses"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
+#: plugins/admin/groups/mail_locals.tpl:52
 msgid "Display addresses of user"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
+#: plugins/admin/groups/mail_locals.tpl:55
 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
@@ -812,7 +804,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/users/class_userManagement.inc:681
 msgid "Change password"
 msgstr ""
 
@@ -836,19 +828,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 ""
 
@@ -868,8 +860,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: 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
+#: include/functions.inc:1285 ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -892,14 +884,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 ""
 
@@ -1021,7 +1013,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 ""
 
@@ -1042,7 +1034,7 @@ msgstr ""
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
 msgid "UID"
 msgstr ""
 
@@ -1080,7 +1072,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 ""
 
@@ -1095,273 +1087,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:657
 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:660
 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:691
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1375,7 +1367,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 ""
 
@@ -1424,17 +1416,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 ""
 
@@ -1503,240 +1495,235 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/samba3_workstations.tpl:30
-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: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:543
+#: 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:546
+#: 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 ""
 
@@ -1764,7 +1751,7 @@ 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/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:9
@@ -1773,15 +1760,15 @@ 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 html/getxls.php:54 html/getxls.php:149
-#: html/getxls.php:194 html/getxls.php:203 html/getxls.php:206
+#: 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/admin/users/template.tpl:23
+#: plugins/addons/addressbook/class_addressbook.inc:507
+#: plugins/admin/users/template.tpl:23 html/getxls.php:65 html/getxls.php:174
+#: html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr ""
 
@@ -1809,7 +1796,8 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:81 html/getxls.php:194
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Sex"
 msgstr ""
 
@@ -1819,13 +1807,13 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
-#: plugins/admin/applications/generic.tpl:33
+#: plugins/admin/applications/generic.tpl:32
 #: 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: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
+#: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:22
 #: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
@@ -1840,7 +1828,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:54
+#: plugins/admin/departments/generic.tpl:54 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
@@ -1877,21 +1865,21 @@ msgstr ""
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:183 html/getxls.php:206
+#: 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:686
-#: 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 ""
@@ -1916,26 +1904,28 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:231
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:51
-#: plugins/addons/addressbook/address_info.tpl:40
+#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 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 html/getxls.php:149
-#: html/getxls.php:206
+#: 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/workstation.tpl:18 html/getxls.php:149
+#: 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 html/getxls.php:149
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
+#: html/getxls.php:236
 msgid "State"
 msgstr ""
 
@@ -1973,7 +1963,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:339
 #: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:149
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr ""
 
@@ -1998,7 +1988,6 @@ msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/addons/addressbook/address_edit.tpl:114
 #: plugins/admin/systems/servnfs.tpl:91
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
@@ -2012,16 +2001,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:412
+#: 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:245
+#: plugins/admin/fai/faiPackage.tpl:75
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -2051,23 +2040,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 ""
 
@@ -2099,55 +2088,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 ""
@@ -2212,31 +2201,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
@@ -2270,6 +2266,7 @@ msgid "Files"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/addons/mailqueue/contents.tpl:33
 msgid "Size"
 msgstr ""
 
@@ -2321,11 +2318,7 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-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 ""
 
@@ -2334,106 +2327,93 @@ 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:170
 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 ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:250
-msgid "Remove environment extension"
+#: plugins/personal/connectivity/pptp.tpl:1
+msgid "PPTP account"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:215
-#: plugins/personal/environment/class_environment.inc:251
-msgid "Environment extension enabled. You can disable it by clicking below."
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
 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
-msgid "Add environment extension"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:225
-#: plugins/personal/environment/class_environment.inc:258
-msgid "Environment extension disabled. You can enable it by clicking below."
+#: plugins/personal/connectivity/phpscheduleit.tpl:1
+msgid "PHPscheduleit account"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:230
-#: plugins/personal/environment/class_environment.inc:263
-msgid ""
-"Environment extension disabled. You have to setup a posix account before you "
-"can enable this feature."
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:449
-#: plugins/personal/environment/class_environment.inc:451
-#: plugins/admin/systems/class_terminalStartup.inc:131
-#: plugins/admin/systems/class_workstationStartup.inc:277
-msgid "You must specify a valid mount point."
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:679
-msgid "Please set a valid profile quota size."
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:686
-msgid ""
-"You need to setup a valid posix extension in order to enable evironment "
-"features."
+#: plugins/personal/environment/class_hotplugDialog.inc:111
+msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:708
-msgid "Can't save new kiosk profiles, possibly permission denied for folder"
+#: plugins/personal/environment/class_hotplugDialog.inc:114
+msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:801
-msgid "Error while writing printer"
+#: plugins/personal/environment/class_hotplugDialog.inc:117
+msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:871
-msgid "Error while writing printer settings"
+#: plugins/personal/environment/class_hotplugDialog.inc:123
+msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:986
-msgid "Admin"
+#: plugins/personal/environment/class_hotplugDialog.inc:128
+msgid "Please select an entry or press cancel."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:3
@@ -2519,8 +2499,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 ""
 
@@ -2536,24 +2516,66 @@ msgstr ""
 msgid "Admin Toggle"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:109
-msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
+#: plugins/personal/environment/class_environment.inc:246
+#: plugins/personal/environment/class_environment.inc:282
+msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:112
-msgid "Invalid character in description. Please specify a valid description."
+#: plugins/personal/environment/class_environment.inc:247
+#: plugins/personal/environment/class_environment.inc:283
+msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:115
-msgid "Please specify a valid id."
+#: plugins/personal/environment/class_environment.inc:256
+#: plugins/personal/environment/class_environment.inc:261
+#: plugins/personal/environment/class_environment.inc:289
+#: plugins/personal/environment/class_environment.inc:294
+msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:121
-msgid "An Entry with this name already exists."
+#: plugins/personal/environment/class_environment.inc:257
+#: plugins/personal/environment/class_environment.inc:290
+msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:126
-msgid "Please select an entry or press cancel."
+#: plugins/personal/environment/class_environment.inc:262
+#: plugins/personal/environment/class_environment.inc:295
+msgid ""
+"Environment extension disabled. You have to setup a posix account before you "
+"can enable this feature."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:485
+#: plugins/personal/environment/class_environment.inc:487
+#: 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:716
+msgid "Please set a valid profile quota size."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:723
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:745
+msgid "Can't save new kiosk profiles, possibly permission denied for folder"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:838
+msgid "Error while writing printer"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:908
+msgid "Error while writing printer settings"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1030
+msgid "Admin"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:1
@@ -2568,29 +2590,23 @@ msgstr ""
 msgid "Select hotplug device to add"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:28
-msgid ""
-"This menu allows you to select existing hotplug devices. All devices of all "
-"users are choosable here."
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:44
+#: plugins/personal/environment/hotplugDialog.tpl:34
 msgid "Choose the department the search will be based    on"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:53
-#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/groups/group_objects.tpl:38
 #: plugins/admin/users/headpage.tpl:48
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:58
+#: plugins/personal/environment/hotplugDialog.tpl:48
 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 ""
 
@@ -2604,18 +2620,11 @@ msgstr ""
 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."
-msgstr ""
-
-#: plugins/personal/environment/selectPrinterDialog.tpl:54
+#: plugins/personal/environment/selectPrinterDialog.tpl:43
 msgid "Display printers matching"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:59
+#: plugins/personal/environment/selectPrinterDialog.tpl:48
 msgid "Regular expression for matching printer names"
 msgstr ""
 
@@ -2630,7 +2639,7 @@ msgstr ""
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
 #: plugins/admin/systems/printer.tpl:13
@@ -2646,8 +2655,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 html/getxls.php:103
-#: html/getxls.php:200
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
+#: html/getxls.php:230
 msgid "Description"
 msgstr ""
 
@@ -2672,16 +2681,31 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:93
-msgid "Specified name is invalid."
-msgstr ""
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
-msgid "Specified description contains invalid characters."
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:1
-msgid "Create new hotplug entry"
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/personal/environment/kioskManagement.tpl:24
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/groups/application_options.tpl:8
+#: 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 ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified name is invalid."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified description contains invalid characters."
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+msgid "Create new hotplug entry"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:8
@@ -2701,22 +2725,22 @@ msgstr ""
 msgid "save"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#: plugins/personal/environment/class_kioskManagementDialog.inc:61
 #, 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:64
 #, 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:88
 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:94
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2732,98 +2756,113 @@ msgstr ""
 msgid "Browse"
 msgstr ""
 
-#: plugins/personal/environment/kioskManagement.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:59
-msgid "Close"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
 msgstr ""
 
-#: plugins/personal/nagios/main.inc:124
-msgid "User nagios settings"
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:82
-msgid "This account has no nagios extensions."
+#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:174
+msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:91
-msgid "Remove nagios account"
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
-msgid "Create nagios account"
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:169
-msgid "The required field 'NagiosAlias' is not set."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-msgid "The required field 'NagiosMail' is not set."
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-#: plugins/personal/nagios/class_nagiosAccount.inc:180
-msgid "Please enter a valid email address in 'NagiosMail' field."
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "alias"
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:12
-msgid "email"
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host Notification Period"
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service Notification Period"
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service Notification Options"
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host Notification Options"
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:48
-msgid "pager"
+#: plugins/personal/nagios/main.inc:124
+msgid "Nagios settings"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service Notification Commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host Notification Commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios Auth"
+#: 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:104
+msgid "Create nagios account"
+msgstr ""
+
+#: 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:163
+msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:68
-msgid "authorized_for_system_information"
+#: plugins/personal/nagios/class_nagiosAccount.inc:166
+msgid "The required field 'NagiosMail' is not set."
+msgstr ""
+
+#: 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 ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2844,7 +2883,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 ""
@@ -2861,7 +2900,7 @@ msgstr ""
 msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/gofax/blocklists/generic.tpl:72
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
@@ -2869,230 +2908,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:666
-#: 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:426
+#: 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:666
-#: 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/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:426
+#: 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:667
-#: 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:429
+#: 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:667
-#: 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:429
+#: 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:668
-#: 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:668
-#: 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:432
+#: 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:673
-#: 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:461
+#: 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:674
-#: 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:462
+#: 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:674
-#: 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:462
+#: 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:677
-#: 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:480
+#: 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:677
-#: 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:679
-#: 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:481
+#: 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:679
-#: 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:688
-#: 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:477
+#: 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 ""
 
@@ -3108,19 +3147,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
@@ -3167,8 +3204,8 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:54
-#: html/getxls.php:194
+#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Language"
 msgstr ""
 
@@ -3208,15 +3245,15 @@ msgstr ""
 msgid "Alternate fax numbers"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:85
+#: plugins/gofax/faxaccount/generic.tpl:81
 msgid "Blocklists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:88
+#: plugins/gofax/faxaccount/generic.tpl:84
 msgid "Blocklists for incoming fax"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:94
+#: plugins/gofax/faxaccount/generic.tpl:90
 msgid "Blocklists for outgoing fax"
 msgstr ""
 
@@ -3228,51 +3265,32 @@ msgstr ""
 msgid "Display numbers of department"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:40
+#: plugins/gofax/faxaccount/locals.tpl:38
 msgid "Display numbers matching"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:43
+#: plugins/gofax/faxaccount/locals.tpl:41
 msgid "Regular expression for matching numbers"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:49
+#: plugins/gofax/faxaccount/locals.tpl:47
 msgid "Display numbers of user"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:52
+#: plugins/gofax/faxaccount/locals.tpl:50
 msgid "User name of which numbers are shown"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:4
+#: plugins/gofax/faxaccount/lists.tpl:5
 msgid "Blocked numbers/lists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:24
-msgid "Select a specific department"
-msgstr ""
-
-#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
-#: plugins/admin/groups/mail_admins.tpl:30
-msgid "Choose"
-msgstr ""
-
-#: plugins/gofax/faxaccount/lists.tpl:27
+#: plugins/gofax/faxaccount/lists.tpl:17
 msgid "List of predefined blocklists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: 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"
+#: plugins/gofax/faxaccount/lists.tpl:25
+msgid "Add the list to the blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/main.inc:105
@@ -3286,51 +3304,56 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:111
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:137
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:120
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
 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:149
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
 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:218
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
+msgid "back"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:641
 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:649
 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:651
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:657
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3349,8 +3372,8 @@ msgid "FAX ID"
 msgstr ""
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:560
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/systems/class_printGeneric.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr ""
@@ -3394,7 +3417,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 ""
 
@@ -3428,6 +3453,7 @@ msgid "Date"
 msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:35
 msgid "Sender"
 msgstr ""
 
@@ -3445,28 +3471,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 ""
 
@@ -3540,10 +3566,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 ""
 
@@ -3557,8 +3583,8 @@ msgid "Personal"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Initials"
 msgstr ""
 
@@ -3578,8 +3604,8 @@ msgid "Company"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
 msgid "City"
 msgstr ""
 
@@ -3588,7 +3614,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 "
@@ -3603,84 +3629,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:153
 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 html/getxls.php:149
+#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:174
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:66
-#: html/getxls.php:88 html/getxls.php:103 html/getxls.php:238
-#: html/getxls.php:253
+#: 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 +3717,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 +3819,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 ""
 
@@ -3834,7 +3861,6 @@ msgid "Export successful"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
-#: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the complete LDAP database to a file"
 msgstr ""
 
@@ -3851,13 +3877,13 @@ msgstr ""
 msgid "CSV import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:35
-#: plugins/addons/ldapmanager/class_exportxls.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_exportxls.inc:85
+#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_exportxls.inc:88
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
@@ -3877,7 +3903,11 @@ msgid "Export complete XLS for"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
-msgid "Click here to save the LDAP Export to a xls file "
+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
@@ -3893,13 +3923,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 ""
 
@@ -3935,7 +3965,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 ""
 
@@ -3975,48 +4005,113 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
+#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+msgid "Mail queue"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:46
+msgid ""
+"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
+"specified."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:68
+#: plugins/addons/mailqueue/class_mailqueue.inc:87
+#, php-format
+msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:127
+msgid "up"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:129
+msgid "down"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:167
+msgid "no limit"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:172
+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:25
+msgid "Search returned no results"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "ID"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Arrival"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Recipient"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:37
+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:281
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:281
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:281
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:267
+#: plugins/admin/groups/class_groupGeneric.inc:282
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:272
+#: plugins/admin/groups/class_groupGeneric.inc:287
 #, 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:621
+#: 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:631
 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:642
+#: plugins/admin/groups/class_groupGeneric.inc:649
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -4028,19 +4123,19 @@ msgstr ""
 msgid "Select mail server to place user on"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:66
+#: plugins/admin/groups/mail.tpl:63
 msgid "IMAP shared folders"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:70
+#: plugins/admin/groups/mail.tpl:67
 msgid "Default permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:79
+#: plugins/admin/groups/mail.tpl:76
 msgid "Member permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:94
+#: plugins/admin/groups/mail.tpl:88
 msgid "Forward messages to non group members"
 msgstr ""
 
@@ -4060,77 +4155,77 @@ msgid "Group administration"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:80
-#: html/getxls.php:212
+#: 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:724
+#: 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:687
+#: 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."
@@ -4160,28 +4255,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:617
 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:650
 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:654
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -4189,6 +4284,10 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
+#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+msgid "Choose"
+msgstr ""
+
 #: plugins/admin/groups/acl.tpl:17
 msgid "Apply this acl only for users own entries"
 msgstr ""
@@ -4213,20 +4312,20 @@ msgstr ""
 msgid "Select users to add"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/groups/group_objects.tpl:29
 msgid "Display users of department"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/groups/group_objects.tpl:39
 #: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:55
+#: plugins/admin/groups/class_groupAcl.inc:58
 msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:200
+#: plugins/admin/groups/class_groupAcl.inc:203
 msgid "All fields are writeable"
 msgstr ""
 
@@ -4242,7 +4341,7 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:24
 msgid "Choose subtree to place group in"
 msgstr ""
 
@@ -4266,15 +4365,15 @@ msgstr ""
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:66
+#: plugins/admin/groups/generic.tpl:67
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:77
+#: plugins/admin/groups/generic.tpl:80
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:92
+#: plugins/admin/groups/generic.tpl:96
 msgid "Group members"
 msgstr ""
 
@@ -4282,39 +4381,51 @@ msgstr ""
 msgid "Folder administrators"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:61
+#: plugins/admin/groups/mail_admins.tpl:24
+msgid "Select a specific department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
+#: 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 ""
@@ -4333,22 +4444,22 @@ 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:1010
-#: 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:396
 #: plugins/admin/fai/faiPackageNew.tpl:65
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step2.tpl:13
 #: ihtml/themes/altlinux/setup_step3.tpl:18
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -4362,57 +4473,58 @@ msgid "User administration"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:65 html/getxls.php:56 html/getxls.php:211
+#: 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:485
+#: 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:555
+#: 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:670
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/users/class_userManagement.inc:681
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:686
-#: 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
@@ -4420,59 +4532,59 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:691
+#: plugins/admin/users/class_userManagement.inc:694
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:727
+#: plugins/admin/users/class_userManagement.inc:730
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/users/class_userManagement.inc:732
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/users/class_userManagement.inc:734
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/users/class_userManagement.inc:736
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:735
+#: plugins/admin/users/class_userManagement.inc:738
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/users/class_userManagement.inc:740
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:795
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:799
+#: 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 "
@@ -4540,11 +4652,20 @@ 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 ""
 
-#: plugins/admin/applications/generic.tpl:12
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:13
+msgid "Application name to be displayed (i.e. below icons)"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:17
 #: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
 #: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
@@ -4552,93 +4673,89 @@ msgstr ""
 msgid "Execute"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:14
+#: plugins/admin/applications/generic.tpl:19
 msgid "Path and/or binary name of application"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:18
-#: plugins/gofon/macro/generic.tpl:10
-msgid "Display name"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:20
-msgid "Application name to be displayed (i.e. below icons)"
+#: plugins/admin/applications/generic.tpl:34
+msgid "Choose subtree to place application in"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:35
-msgid "Choose subtree to place application in"
+#: plugins/admin/applications/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:18
+msgid "Category"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:46
+#: plugins/admin/applications/generic.tpl:57
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:51
+#: plugins/admin/applications/generic.tpl:65
 msgid "Update"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:51
+#: plugins/admin/applications/generic.tpl:65
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:62
+#: plugins/admin/applications/generic.tpl:79
 msgid "Only executable for members"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:64
+#: plugins/admin/applications/generic.tpl:81
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:68
+#: plugins/admin/applications/generic.tpl:85
 msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:71
+#: plugins/admin/applications/generic.tpl:88
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/applications/generic.tpl:101
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Upload"
 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."
@@ -4668,54 +4785,67 @@ 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:82
+#: plugins/admin/applications/class_applicationGeneric.inc:39
+msgid ""
+"There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:47
+#: plugins/admin/applications/class_applicationGeneric.inc:50
+#, php-format
+msgid ""
+"The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not "
+"accessable."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:103
 msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:97
+#: plugins/admin/applications/class_applicationGeneric.inc:124
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:213
+#: plugins/admin/applications/class_applicationGeneric.inc:240
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:294
+#: plugins/admin/applications/class_applicationGeneric.inc:321
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:299
+#: plugins/admin/applications/class_applicationGeneric.inc:326
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:303
+#: plugins/admin/applications/class_applicationGeneric.inc:330
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:307
+#: plugins/admin/applications/class_applicationGeneric.inc:334
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:316
+#: plugins/admin/applications/class_applicationGeneric.inc:343
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
@@ -4740,10 +4870,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:18
-msgid "Category"
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:20
 msgid "Category for this subtree"
 msgstr ""
@@ -4773,20 +4899,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
@@ -4814,103 +4940,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:432
 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:501
 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_workstationStartup.inc:215
+#: plugins/admin/systems/class_workstationService.inc:124
 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 ""
 
@@ -4926,32 +5052,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:438
-#: 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:456
+#: 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 ""
@@ -5090,6 +5216,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"
@@ -5120,54 +5250,54 @@ 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 ""
 
-#: plugins/admin/systems/server.tpl:6
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr ""
 
@@ -5203,7 +5333,7 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:36
 #: plugins/admin/systems/workstation.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr ""
 
@@ -5261,94 +5391,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."
@@ -5404,288 +5534,297 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:68
-msgid "Activated"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:69
-msgid "Locked"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Memory test"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:94
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:106
-msgid "This 'dn' has no workstation features."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:124
-msgid "Instant update"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:125
-#: plugins/admin/systems/class_workstationGeneric.inc:129
-msgid "Scheduled update"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:126
-msgid "Rescan hardware"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:194
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:198
-msgid "The required field 'Workstation name' is not set."
-msgstr ""
-
 #: plugins/admin/systems/class_systemManagement.inc:32
 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:211
+#: plugins/admin/fai/class_faiManagement.inc:250
 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:471
 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:186
-#: plugins/admin/systems/class_printGeneric.inc:207
-#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_workstationGeneric.inc:68
+msgid "Activated"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:69
+msgid "Locked"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Memory test"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:97
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+msgid "This 'dn' has no workstation features."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:127
+msgid "Instant update"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:128
+#: plugins/admin/systems/class_workstationGeneric.inc:132
+msgid "Scheduled update"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:129
+msgid "Rescan hardware"
+msgstr ""
+
+#: 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:201
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:194
+#: plugins/admin/systems/class_printGeneric.inc:215
+#: plugins/admin/systems/class_printGeneric.inc:218
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:187
+#: plugins/admin/systems/class_printGeneric.inc:195
 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:199
-#: plugins/admin/systems/class_printGeneric.inc:202
+#: plugins/admin/systems/class_printGeneric.inc:207
+#: plugins/admin/systems/class_printGeneric.inc:210
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:200
+#: plugins/admin/systems/class_printGeneric.inc:208
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:203
+#: plugins/admin/systems/class_printGeneric.inc:211
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:208
+#: plugins/admin/systems/class_printGeneric.inc:216
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:219
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:222
+#: plugins/admin/systems/class_printGeneric.inc:230
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:364
+#: plugins/admin/systems/class_printGeneric.inc:362
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:370
+msgid "can't get ppd informations."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:382
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:366
+#: plugins/admin/systems/class_printGeneric.inc:384
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:428
+#: plugins/admin/systems/class_printGeneric.inc:446
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:555
-#: plugins/admin/systems/class_printGeneric.inc:557
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/systems/class_printGeneric.inc:582
+#: plugins/admin/systems/class_printGeneric.inc:584
+#: 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 ""
@@ -5758,61 +5897,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 ""
 
@@ -5896,7 +6035,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 "
@@ -5989,22 +6128,25 @@ 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 ""
 
@@ -6050,124 +6192,124 @@ 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 ""
 
 #: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
+msgid "Advanced phone settings"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:9
+#: plugins/admin/systems/phonesettings.tpl:6
 msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/admin/systems/phonesettings.tpl:10
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:32
 msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/phonesettings.tpl:75
 msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
+#: plugins/admin/systems/phonesettings.tpl:106
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
+#: plugins/admin/systems/phonesettings.tpl:116
 msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
+#: plugins/admin/systems/phonesettings.tpl:124
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
+#: plugins/admin/systems/phonesettings.tpl:132
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
+#: plugins/admin/systems/phonesettings.tpl:145
 msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
+#: plugins/admin/systems/phonesettings.tpl:153
 msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
+#: plugins/admin/systems/phonesettings.tpl:168
 msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
+#: plugins/admin/systems/phonesettings.tpl:183
 msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:210
+#: plugins/admin/systems/phonesettings.tpl:205
 msgid "MSN"
 msgstr ""
 
@@ -6301,27 +6443,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 ""
 
@@ -6346,7 +6488,7 @@ msgid "Printer driver"
 msgstr ""
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:48
 msgid "Select"
 msgstr ""
 
@@ -6354,74 +6496,62 @@ msgstr ""
 msgid "New driver"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
+#: plugins/admin/systems/class_printerPPDDialog.inc:64
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
+#: plugins/admin/systems/class_printerPPDDialog.inc:105
+#, php-format
 msgid ""
-"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"
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
-msgid "Display members matching"
-msgstr ""
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
-msgid "Regular expression for matching member names"
+#: plugins/admin/systems/class_printerPPDDialog.inc:106
+msgid "Can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#: plugins/admin/systems/class_printerPPDDialog.inc:122
 #, php-format
-msgid "Can't open '%s', ppd settings reseted."
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:100
-#, php-format
-msgid "Cab't create folder '%s' for the uploaded ppd file."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:113
+#: plugins/admin/systems/class_printerPPDDialog.inc:135
 #, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:120
+#: plugins/admin/systems/class_printerPPDDialog.inc:143
 #, php-format
-msgid "Can't save file '%s'"
+msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:136
-#: plugins/admin/systems/class_printerPPDDialog.inc:139
+#: plugins/admin/systems/class_printerPPDDialog.inc:162
+#: plugins/admin/systems/class_printerPPDDialog.inc:165
 msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:189
 msgid "Please select a valid ppd."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/systems/class_printerPPDDialog.inc:297
 #: plugins/admin/fai/faiPackage.tpl:41
 msgid "Section"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:320
-#: plugins/admin/systems/class_printerPPDDialog.inc:323
+#: plugins/admin/systems/class_printerPPDDialog.inc:347
+#: plugins/admin/systems/class_printerPPDDialog.inc:350
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:321
-#: plugins/admin/systems/class_printerPPDDialog.inc:324
+#: plugins/admin/systems/class_printerPPDDialog.inc:348
+#: plugins/admin/systems/class_printerPPDDialog.inc:351
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:329
+#: plugins/admin/systems/class_printerPPDDialog.inc:356
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
@@ -6431,12 +6561,7 @@ msgstr ""
 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/systems/printerPPDSelectionDialog.tpl:32
 #: 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
@@ -6444,20 +6569,40 @@ msgstr ""
 msgid "Display objects matching"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:45
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:36
 #: 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'."
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:50
+msgid "Close"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:248
-msgid ""
-"There is already a profile in your selection that contain partition table "
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member 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:251
+msgid ""
+"There is already a profile in your selection that contain partition table "
 "configuratons."
 msgstr ""
 
@@ -6598,15 +6743,25 @@ 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/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:43
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -6659,6 +6814,10 @@ msgstr ""
 msgid "Select to see phones"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr ""
+
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -6670,59 +6829,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
+#: plugins/admin/ogroups/class_ogroup.inc:536
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
@@ -6735,9 +6894,9 @@ msgstr ""
 msgid "UNIX accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:128
-#: html/getxls.php:134 html/getxls.php:151 html/getxls.php:213
-#: html/getxls.php:269
+#: 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 ""
 
@@ -6749,25 +6908,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 ""
@@ -6776,7 +6935,7 @@ msgstr ""
 msgid "Name of the group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
+#: plugins/admin/ogroups/generic.tpl:33
 msgid "Member objects"
 msgstr ""
 
@@ -6837,16 +6996,6 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
@@ -6871,103 +7020,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 ""
@@ -7095,8 +7240,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
@@ -7111,102 +7256,102 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:201
+#: plugins/admin/fai/class_faiManagement.inc:205
 #, 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:437
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/admin/fai/class_faiManagement.inc:437
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:442
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:442
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:445
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:445
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:448
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:448
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:451
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:451
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:454
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:454
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:457
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:457
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:466
+#: plugins/admin/fai/class_faiManagement.inc:475
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:467
+#: plugins/admin/fai/class_faiManagement.inc:476
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/admin/fai/class_faiManagement.inc:480
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:472
+#: plugins/admin/fai/class_faiManagement.inc:481
 msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:514
-#: plugins/admin/fai/class_faiManagement.inc:515
-#: plugins/admin/fai/class_faiProfile.inc:158
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiManagement.inc:523
+#: plugins/admin/fai/class_faiManagement.inc:524
+#: 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:530
+#: plugins/admin/fai/class_faiManagement.inc:531
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:528
-#: plugins/admin/fai/class_faiManagement.inc:529
+#: plugins/admin/fai/class_faiManagement.inc:537
+#: plugins/admin/fai/class_faiManagement.inc:538
 msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:549
-#: plugins/admin/fai/class_faiManagement.inc:550
+#: plugins/admin/fai/class_faiManagement.inc:558
+#: plugins/admin/fai/class_faiManagement.inc:559
 msgid "Profile"
 msgstr ""
 
@@ -7224,7 +7369,9 @@ msgstr ""
 
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:32 plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiTemplate.tpl:32
+#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/faiHook.tpl:32
 msgid "Objects"
 msgstr ""
 
@@ -7278,24 +7425,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:96
-#: plugins/admin/fai/class_faiVariableEntry.inc:83
-#: plugins/admin/fai/class_faiHookEntry.inc:101
-#: 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_faiTemplateEntry.inc:164
+#: plugins/admin/fai/class_faiHookEntry.inc:104
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:100
+#: plugins/admin/fai/class_faiScriptEntry.inc:103
 msgid "Please enter a script."
 msgstr ""
 
@@ -7313,24 +7460,24 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:118
+#: plugins/admin/fai/class_faiPackage.inc:123
 msgid "There is no useable package list defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:256
+#: plugins/admin/fai/class_faiPackage.inc:261
 #, php-format
 msgid "Can't read configuration folder '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:338
+#: plugins/admin/fai/class_faiPackage.inc:343
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:342
+#: plugins/admin/fai/class_faiPackage.inc:347
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:373
+#: plugins/admin/fai/class_faiPackage.inc:378
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
@@ -7351,64 +7498,64 @@ msgstr ""
 msgid "mirror"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:68
 msgid "Used packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:69
+#: plugins/admin/fai/faiPackage.tpl:70
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:75 include/functions.inc:587
+#: plugins/admin/fai/faiPackage.tpl:76 include/functions.inc:587
 msgid "Configure"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:142
-#: 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:150
+#: plugins/admin/fai/class_faiProfile.inc:153
 msgid "Append new class names"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:153
-#: 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:154
-#: 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:155
-#: 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:156
-#: 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:157
+#: plugins/admin/fai/class_faiProfile.inc:160
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:160
+#: plugins/admin/fai/class_faiProfile.inc:163
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:223
+#: plugins/admin/fai/class_faiProfile.inc:226
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:227
+#: plugins/admin/fai/class_faiProfile.inc:230
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:235
+#: plugins/admin/fai/class_faiProfile.inc:238
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
@@ -7448,64 +7595,64 @@ 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 ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:334
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:339
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:344
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:348
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:354
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:358
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:364
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:371
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:374
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
@@ -7518,7 +7665,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 ""
 
@@ -7538,26 +7685,64 @@ msgstr ""
 msgid "Choose a template to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:219
-#: plugins/admin/fai/class_faiPartitionTable.inc:225
+#: 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:221
-#: plugins/admin/fai/class_faiPartitionTable.inc:227
+#: 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:97
+#: plugins/admin/fai/class_faiTemplateEntry.inc:74
+msgid "no file uploaded yet"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:76
+#, php-format
+msgid "exists in database (size: %s bytes)"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:156
+msgid "Please specify a value for attribute 'file'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:160
+msgid "Please specify a value for attribute 'path'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
+msgid "Please enter a user."
+msgstr ""
+
+#: 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:175
+msgid "Please enter a group."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+msgid "Please enter a valid group. Only a-z/0-9 are allowed."
+msgstr ""
+
+#: 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 ""
 
+#: plugins/admin/fai/class_faiProfileEntry.inc:153
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
+msgid "Class name"
+msgstr ""
+
 #: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
 msgid "Hook attributes"
 msgstr ""
@@ -7567,46 +7752,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:131
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:130
+#: plugins/admin/fai/class_askClassName.inc:135
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -7629,10 +7814,6 @@ msgstr ""
 msgid "Enter FAI class name manually"
 msgstr ""
 
-#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
-msgid "Class name"
-msgstr ""
-
 #: plugins/admin/fai/askClassName.tpl:48
 msgid "Choose FAI class name from a list of existing classes"
 msgstr ""
@@ -7646,40 +7827,7 @@ msgid "Use"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:74
-msgid "A new class name.</b>"
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:71
-msgid "no file uploaded yet"
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:73
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:153
-msgid "Please specify a value for attribute 'file'."
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:157
-msgid "Please specify a value for attribute 'path'."
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:165
-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."
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:172
-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."
+msgid "A new class name."
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
@@ -7699,7 +7847,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 ""
 
@@ -7747,7 +7895,11 @@ msgstr ""
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:43
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr ""
@@ -7814,92 +7966,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 ""
@@ -7925,15 +8087,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 ""
 
@@ -7957,62 +8119,12 @@ msgstr ""
 msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:94
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:150
-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
-#, php-format
-msgid "Unable to parse macro contents on line: %s"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:262
-#, 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
-#, php-format
-msgid "Can't perform DELETE query in DB '%s'"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:293
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:336
-#, php-format
-msgid "The given cn '%s' already exists."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:341
-msgid "You must specify the 'Display Name' in order to save this macro"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:345
-msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:350
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:356
-msgid "Makro length must be lower than 100 lines"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:361
-msgid "Please choose a valid  base."
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
@@ -8062,33 +8174,38 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:97
+msgid "This 'dn' is no phone macro."
+msgstr ""
+
+#: 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 "
@@ -8099,46 +8216,91 @@ 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 ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: 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/parameter.tpl:7
-msgid "type"
+#: 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:265
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
+msgstr ""
+
+#: 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:296
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:339
+#, php-format
+msgid "The given cn '%s' already exists."
+msgstr ""
+
+#: 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:348
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+msgstr ""
+
+#: 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:359
+msgid "Makro length must be lower than 100 lines"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:364
+msgid "Please choose a valid  base."
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:13
@@ -8158,7 +8320,8 @@ msgstr ""
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:149
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
 
@@ -8167,7 +8330,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 ""
 
@@ -8203,23 +8366,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 ""
 
@@ -8238,25 +8401,25 @@ msgstr ""
 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 ""
 
@@ -8289,8 +8452,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
@@ -8306,7 +8469,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:315
+#: include/php_setup.inc:71 html/main.php:316
 msgid "Toggle information"
 msgstr ""
 
@@ -8342,6 +8505,75 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
+#: include/class_mail-methods-cyrus.inc:39
+msgid ""
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:52
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:115
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+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: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 ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+
 #: include/functions.inc:282
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
@@ -8433,96 +8665,19 @@ msgstr ""
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:223
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:236
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_pluglist.inc:98
-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
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"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."
@@ -8580,19 +8735,19 @@ msgid ""
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:698
+#: 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:711
+#: 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:727
+#: include/class_ldap.inc:728
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -8621,12 +8776,29 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:292
+#: 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:367
+#: include/functions_helpviewer.inc:459
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
@@ -8878,14 +9050,14 @@ msgstr ""
 
 #: include/functions_setup.inc:383
 #, php-format
-msgid "Checking for function <b>%s</b>"
+msgid "Checking for function %s"
 msgstr ""
 
 #: 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:395
@@ -9042,222 +9214,175 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
+#: include/class_ppdManager.inc:13
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
+msgstr ""
+
+#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:132
+#: include/class_ppdManager.inc:137
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:136
+#: include/class_ppdManager.inc:141
 msgid "Group name not unique!"
 msgstr ""
 
-#: include/class_ppdManager.inc:142 include/class_ppdManager.inc:172
+#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:166
+#: include/class_ppdManager.inc:171
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:191
+#: include/class_ppdManager.inc:196
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:263
+#: include/class_ppdManager.inc:268
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: html/helpviewer.php:58
-msgid "Help is not available if you are not logged in."
+#: include/class_xmlParse.inc:42
+#, php-format
+msgid "Could not open XML input '%s'."
 msgstr ""
 
-#: html/helpviewer.php:89
-msgid "previous"
+#: include/class_xmlParse.inc:116
+#, php-format
+msgid "XML error in %s : %s at line %d"
 msgstr ""
 
-#: html/helpviewer.php:93
-msgid "next"
+#: html/helpviewer.php:113
+msgid "There is no helpfile specified for this class."
 msgstr ""
 
-#: html/helpviewer.php:154
+#: html/helpviewer.php:221
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
-#: html/helpviewer.php:162 ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 
-#: html/getxls.php:54
-msgid "Birthday"
+#: html/setup.php:86
+#, php-format
+msgid ""
+"Directory '%s' specified as smarty compile directory is not accessible, "
+"please check existence and rights of this directory!"
 msgstr ""
 
-#: html/getxls.php:54
-msgid "Sexe"
+#: html/getxls.php:65
+msgid "Birthday"
 msgstr ""
 
-#: html/getxls.php:54 html/getxls.php:149 html/getxls.php:194
-#: html/getxls.php:206
-msgid "Firstname"
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Surname"
 msgstr ""
 
-#: html/getxls.php:79 html/getxls.php:197
-msgid "Members"
+#: html/getxls.php:74
+#, php-format
+msgid "User list of %s on %s"
 msgstr ""
 
-#: html/getxls.php:104 html/getxls.php:214
-msgid "Computers"
+#: html/getxls.php:94 html/getxls.php:227
+msgid "Members"
 msgstr ""
 
-#: html/getxls.php:114 html/getxls.php:161 html/getxls.php:287
-#: html/getxls.php:304
-msgid "Common Name"
+#: html/getxls.php:104 html/getxls.php:295
+#, php-format
+msgid "Groups of %s on %s"
 msgstr ""
 
-#: html/getxls.php:126
-msgid "Server Name"
+#: html/getxls.php:124 html/getxls.php:246
+msgid "Computers"
 msgstr ""
 
-#: html/getxls.php:149
+#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
+#: html/getxls.php:356
 msgid "Common name"
 msgstr ""
 
-#: html/getxls.php:149
-msgid "Display Name"
+#: html/getxls.php:156 html/getxls.php:314
+#, php-format
+msgid "Servers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:149
+#: html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: html/getxls.php:149
-msgid "Mail address"
-msgstr ""
-
-#: html/getxls.php:149
+#: html/getxls.php:174
 msgid "Mobile phone"
 msgstr ""
 
-#: html/getxls.php:149
+#: html/getxls.php:174 html/getxls.php:236
 msgid "Postal address"
 msgstr ""
 
-#: html/getxls.php:149
-msgid "Adress"
-msgstr ""
-
-#: html/getxls.php:149
-msgid "Surename"
-msgstr ""
-
-#: html/getxls.php:149
+#: html/getxls.php:174
 msgid "Function"
 msgstr ""
 
-#: html/getxls.php:194
-msgid "BirthDate"
-msgstr ""
-
-#: html/getxls.php:200
-msgid "Uid"
+#: html/getxls.php:177 html/getxls.php:247
+msgid "Adressbook"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "DisplayName"
+#: html/getxls.php:184 html/getxls.php:349
+#, php-format
+msgid "Adressbook of %s on %s"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "Phone Number"
+#: html/getxls.php:190
+msgid "Common Name"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "Postal Adress"
+#: html/getxls.php:224
+msgid "Day of birth"
 msgstr ""
 
-#: html/getxls.php:206
+#: html/getxls.php:236
 msgid "Email address"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "mobile"
-msgstr ""
-
-#: html/getxls.php:206
-msgid "Organizational Unit"
+#: html/getxls.php:236
+msgid "Organizational unit"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "Postal Address"
-msgstr ""
-
-#: html/getxls.php:206
+#: html/getxls.php:236
 msgid "Postal Code"
 msgstr ""
 
-#: html/getxls.php:206
-msgid "Sn"
-msgstr ""
-
-#: html/getxls.php:206
-msgid "st"
+#: html/getxls.php:236
+msgid "Surename"
 msgstr ""
 
-#: html/getxls.php:206
+#: html/getxls.php:236
 msgid "Title"
 msgstr ""
 
-#: html/getxls.php:215
-msgid "Adressbook"
-msgstr ""
-
-#: html/getfax.php:53
-msgid "Could not connect to database server!"
-msgstr ""
-
-#: html/getfax.php:55
-msgid "Could not select database!"
-msgstr ""
-
-#: html/getfax.php:60 html/getfax.php:68
-msgid "Database query failed!"
-msgstr ""
-
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
+#: html/getxls.php:239
+msgid "Full"
 msgstr ""
 
-#: html/setup.php:86
+#: html/getxls.php:276
 #, php-format
-msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
+msgid "User List of %s on %s"
 msgstr ""
 
-#: 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:157
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-
-#: html/main.php:286
+#: html/getxls.php:330
 #, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:315
-msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+msgid "Computers of %s on %s"
 msgstr ""
 
 #: html/index.php:49
@@ -9301,6 +9426,38 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
+#: html/getfax.php:53
+msgid "Could not connect to database server!"
+msgstr ""
+
+#: html/getfax.php:55
+msgid "Could not select database!"
+msgstr ""
+
+#: html/getfax.php:60 html/getfax.php:68
+msgid "Database query failed!"
+msgstr ""
+
+#: 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:157
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+
+#: html/main.php:287
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:316
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
 #: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
 "The size limit option makes LDAP operations faster and saves the LDAP server "
@@ -9379,6 +9536,20 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -9426,20 +9597,6 @@ msgid ""
 "case by pressing the <i>Remove</i> button."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -9625,6 +9782,10 @@ msgstr ""
 msgid "GOsa help viewer"
 msgstr ""
 
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
 #: ihtml/themes/default/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"