Fixed remove.tpl

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 8fe3e5572bea0155d7dc3e5977e5cbebe57036c7..48cf1bb90208d7d3622a14e2ac14f55aec0d0b06 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -2,89 +2,93 @@
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:23
+#: contrib/gosa.conf:28
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:44
+#: contrib/gosa.conf:51
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:59 contrib/gosa.conf:71 contrib/gosa.conf:80
-#: contrib/gosa.conf:86 contrib/gosa.conf:91 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:114 contrib/gosa.conf:122
-#: contrib/gosa.conf:127 contrib/gosa.conf:132 contrib/gosa.conf:137
-#: contrib/gosa.conf:142 contrib/gosa.conf:147
+#: 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
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:3
-#: plugins/admin/FAI/faiPartitionTable.tpl:4 plugins/admin/FAI/faiScript.tpl:4
-#: plugins/admin/FAI/faiVariableEntry.tpl:5
-#: plugins/admin/FAI/faiTemplate.tpl:4 plugins/admin/FAI/faiHookEntry.tpl:5
-#: plugins/admin/FAI/faiVariable.tpl:4 plugins/admin/FAI/faiScriptEntry.tpl:5
-#: plugins/admin/FAI/faiTemplateEntry.tpl:5 plugins/admin/FAI/faiHook.tpl:4
-#: plugins/admin/FAI/faiProfile.tpl:1 plugins/admin/FAI/faiPackage.tpl:4
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiPartitionTable.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32 plugins/admin/fai/faiScript.tpl:4
+#: plugins/admin/fai/faiVariableEntry.tpl:5
+#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
+#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:60
+#: contrib/gosa.conf:67
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:61 contrib/gosa.conf:72
+#: contrib/gosa.conf:68 contrib/gosa.conf:80
 #: plugins/personal/environment/class_environment.inc:12
 #: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:74
+#: contrib/gosa.conf:69 contrib/gosa.conf:82
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:714
-#: plugins/admin/ogroups/tabs_ogroups.inc:47
+#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/ogroups/tabs_ogroups.inc:73
+#: plugins/admin/ogroups/tabs_ogroups.inc:158
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:63 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:70 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:734
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:64 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:71 plugins/personal/connectivity/main.inc:135
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:65 plugins/personal/generic/generic.tpl:231
-#: plugins/personal/generic/generic.tpl:362
+#: contrib/gosa.conf:72 plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:372
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:718
-#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/users/class_userManagement.inc:732
+#: plugins/admin/departments/generic.tpl:62 html/getxls.php:150
+#: html/getxls.php:207
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:66 plugins/personal/generic/generic.tpl:214
-#: plugins/personal/generic/generic.tpl:352
+#: contrib/gosa.conf:73 plugins/personal/generic/generic.tpl:224
+#: plugins/personal/generic/generic.tpl:362
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:706
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -93,102 +97,174 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:67 contrib/gosa.conf:76 contrib/gosa.conf:82
-#: contrib/gosa.conf:87 contrib/gosa.conf:93 contrib/gosa.conf:101
-#: contrib/gosa.conf:110 contrib/gosa.conf:118 contrib/gosa.conf:123
-#: contrib/gosa.conf:128 contrib/gosa.conf:133 contrib/gosa.conf:138
-#: contrib/gosa.conf:143 contrib/gosa.conf:148
+#: 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"
 msgstr ""
 
-#: contrib/gosa.conf:73
+#: contrib/gosa.conf:75 plugins/personal/nagios/class_nagiosAccount.inc:18
+msgid "Nagios"
+msgstr ""
+
+#: contrib/gosa.conf:81
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:83
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:89 plugins/admin/applications/generic.tpl:58
+#: plugins/admin/systems/printerPPDDialog.tpl:17
+#: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:92 plugins/gofon/phoneaccount/class_phoneAccount.inc:566
+#: contrib/gosa.conf:100 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:98 contrib/gosa.conf:115
+#: contrib/gosa.conf:106 contrib/gosa.conf:124
+#: plugins/admin/ogroups/tabs_ogroups.inc:93
+msgid "Startup"
+msgstr ""
+
+#: contrib/gosa.conf:107 contrib/gosa.conf:125
+#: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:99 contrib/gosa.conf:116
-msgid "Startup"
+#: contrib/gosa.conf:108 contrib/gosa.conf:126
+#: plugins/personal/environment/environment.tpl:168
+#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:100 contrib/gosa.conf:109 contrib/gosa.conf:117
-msgid "Monitoring"
+#: 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
+#: 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/fai/faiProfileEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
+#: plugins/admin/fai/faiPackageEntry.tpl:22
+#: plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
+msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:106
+#: contrib/gosa.conf:115
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:107 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:116 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:160 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:170 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
+#: plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: plugins/addons/ldapmanager/contentexportxls.tpl:32
+#: plugins/addons/ldapmanager/contentexportxls.tpl:47
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:161 plugins/personal/mail/generic.tpl:112
-#: plugins/personal/environment/logonManagement.tpl:53
-#: plugins/personal/environment/logonManagement.tpl:57
+#: contrib/gosa.conf:171
+msgid "Excel Export"
+msgstr ""
+
+#: contrib/gosa.conf:172 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/FAI/faiScriptEntry.tpl:56
+#: plugins/admin/applications/generic.tpl:83
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:162
+#: contrib/gosa.conf:173
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:177
+msgid "Partitions"
+msgstr ""
+
+#: contrib/gosa.conf:181 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:81
+#: plugins/admin/fai/faiScriptEntry.tpl:50
+#: plugins/admin/fai/faiHookEntry.tpl:50
+msgid "Script"
+msgstr ""
+
+#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:542
+#: plugins/admin/fai/class_faiManagement.inc:543
+msgid "Hooks"
+msgstr ""
+
+#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:535
+#: plugins/admin/fai/class_faiManagement.inc:536
+msgid "Variables"
+msgstr ""
+
+#: contrib/gosa.conf:193 plugins/admin/fai/class_faiManagement.inc:556
+#: plugins/admin/fai/class_faiManagement.inc:557
+msgid "Templates"
+msgstr ""
+
+#: contrib/gosa.conf:197 plugins/personal/environment/environment.tpl:7
+msgid "Profiles"
+msgstr ""
+
+#: contrib/gosa.conf:201
+msgid "Packages"
+msgstr ""
+
+#: contrib/gosa.conf:217
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/admin/ogroups/class_phonequeue.inc:160
+#: contrib/gosa.conf:234 plugins/admin/ogroups/class_phonequeue.inc:161
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:235
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:197
+#: contrib/gosa.conf:236
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:237
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:199
+#: contrib/gosa.conf:238
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:239
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:240
 msgid "Italian"
 msgstr ""
 
@@ -206,6 +282,7 @@ msgstr ""
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
 #: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/reports/class_faxreport.inc:7
@@ -214,6 +291,7 @@ msgstr ""
 #: plugins/addons/ldapmanager/class_import.inc:7
 #: plugins/addons/ldapmanager/class_ldif.inc:8
 #: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
@@ -338,7 +416,7 @@ msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:707
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -354,6 +432,7 @@ 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
 msgid "not defined"
 msgstr ""
 
@@ -381,8 +460,11 @@ msgstr ""
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/environment/environment.tpl:114
-#: plugins/personal/environment/environment.tpl:169
+#: 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/kioskManagement.tpl:13
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
@@ -391,21 +473,25 @@ msgstr ""
 #: 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:88 plugins/admin/groups/mail_locals.tpl:68
-#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
 #: plugins/admin/systems/phonesettings.tpl:181
 #: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:53
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:92
+#: 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/phonequeue.tpl:24
-#: plugins/admin/FAI/faiPartitionTable.tpl:43
-#: plugins/admin/FAI/faiScript.tpl:43 plugins/admin/FAI/faiTemplate.tpl:43
-#: plugins/admin/FAI/faiVariable.tpl:43 plugins/admin/FAI/faiHook.tpl:43
-#: plugins/admin/FAI/class_faiProfile.inc:144
+#: 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/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
 msgid "Add"
 msgstr ""
@@ -415,30 +501,33 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:309
 #: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/personal/environment/environment.tpl:115
-#: plugins/personal/environment/environment.tpl:155
-#: plugins/personal/environment/environment.tpl:170
+#: plugins/personal/environment/environment.tpl:135
+#: 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:90 plugins/admin/users/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/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
-#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: 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/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/phonequeue.tpl:25
-#: plugins/admin/FAI/faiPartitionTable.tpl:45
-#: plugins/admin/FAI/faiScript.tpl:45 plugins/admin/FAI/faiTemplate.tpl:45
-#: plugins/admin/FAI/remove.tpl:15 plugins/admin/FAI/faiVariable.tpl:45
-#: plugins/admin/FAI/faiHook.tpl:45 plugins/gofon/phoneaccount/generic.tpl:15
+#: 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
 msgid "Delete"
 msgstr ""
@@ -487,7 +576,7 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
 #: plugins/personal/connectivity/class_proxyAccount.inc:78
-#: plugins/personal/environment/environment.tpl:57
+#: plugins/personal/environment/environment.tpl:71
 msgid "MB"
 msgstr ""
 
@@ -528,20 +617,21 @@ msgstr ""
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
+#: 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/faxaccount/main.inc:89
 #: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:615
+#: 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:527
+#: plugins/admin/systems/class_systemManagement.inc:536
 #: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/admin/FAI/class_faiManagement.inc:338
+#: plugins/admin/fai/class_faiManagement.inc:381
 #: plugins/gofon/phoneaccount/main.inc:104
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:267
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:269
 msgid "Finish"
 msgstr ""
 
@@ -554,12 +644,13 @@ msgstr ""
 #: plugins/personal/generic/generic_picture.tpl:31
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
+#: plugins/personal/connectivity/main.inc:117
 #: plugins/personal/environment/main.inc:106
-#: plugins/personal/environment/hotplugDialog.tpl:76
-#: plugins/personal/environment/selectPrinterDialog.tpl:75
-#: plugins/personal/environment/logonManagement.tpl:78
-#: plugins/personal/environment/hotplugDialogNew.tpl:30
+#: plugins/personal/environment/hotplugDialog.tpl:74
+#: plugins/personal/environment/selectPrinterDialog.tpl:72
+#: 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
@@ -574,51 +665,60 @@ msgstr ""
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:617
+#: plugins/admin/users/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:529
+#: plugins/admin/systems/class_systemManagement.inc:538
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:86
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
+#: 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/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/admin/FAI/class_faiManagement.inc:340
-#: plugins/admin/FAI/class_faiManagement.inc:344
-#: plugins/admin/FAI/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/remove.tpl:16
+#: 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/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiProfileEntry.tpl:72
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiVariableEntry.tpl:49
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:133
+#: plugins/admin/fai/faiPackageEntry.tpl:66
+#: plugins/admin/fai/faiPackageNew.tpl:66
+#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:269
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:271
 #: plugins/gofon/conference/remove.tpl:17
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/connectivity/main.inc:125
 #: plugins/personal/environment/main.inc:114
-#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:111
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/connectivity/main.inc:126
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/environment/environment.tpl:116
+#: 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/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/printer.tpl:61
-#: plugins/admin/FAI/faiPartitionTable.tpl:44
-#: plugins/admin/FAI/faiScript.tpl:44 plugins/admin/FAI/faiTemplate.tpl:44
-#: plugins/admin/FAI/faiVariable.tpl:44 plugins/admin/FAI/faiHook.tpl:44
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:44
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
+#: plugins/admin/fai/faiTemplate.tpl:44 plugins/admin/fai/faiHook.tpl:44
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr ""
@@ -646,12 +746,14 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
 #: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:32
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/admin/FAI/headpage.tpl:29
-#: plugins/admin/FAI/faiProfileEntry.tpl:29
+#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/fai/faiProfileEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/faiPackageEntry.tpl:34
 #: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:28
+#: plugins/gofon/conference/headpage.tpl:29
 msgid "Filters"
 msgstr ""
 
@@ -664,7 +766,7 @@ msgstr ""
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:44
+#: plugins/personal/environment/selectPrinterDialog.tpl:45
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
 #: plugins/admin/groups/group_objects.tpl:34
@@ -697,7 +799,7 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/class_systemManagement.inc:658
 #: 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
@@ -710,7 +812,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:678
 msgid "Change password"
 msgstr ""
 
@@ -761,11 +863,12 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
+#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
-#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
+#: include/functions.inc:1285 ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
@@ -893,17 +996,17 @@ msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:74
+#: plugins/admin/groups/headpage.tpl:73
 msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/admin/groups/headpage.tpl:76
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -977,7 +1080,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Group of user"
 msgstr ""
 
@@ -987,7 +1090,8 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:206
+#: plugins/admin/systems/class_workstationService.inc:107
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
 msgid "automatic"
 msgstr ""
 
@@ -1047,7 +1151,7 @@ msgstr ""
 #: 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:222
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -1058,7 +1162,7 @@ msgstr ""
 #: 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:222
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1069,7 +1173,7 @@ msgstr ""
 #: 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:222
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1080,7 +1184,7 @@ msgstr ""
 #: 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:222
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1091,7 +1195,7 @@ msgstr ""
 #: 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:223
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1102,7 +1206,7 @@ msgstr ""
 #: 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:223
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1113,7 +1217,7 @@ msgstr ""
 #: 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:223
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1124,7 +1228,7 @@ msgstr ""
 #: 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:223
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1135,7 +1239,7 @@ msgstr ""
 #: 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:223
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1146,7 +1250,7 @@ msgstr ""
 #: 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:224
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1157,7 +1261,7 @@ msgstr ""
 #: 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:224
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1168,97 +1272,96 @@ msgstr ""
 #: 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:224
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:545
 #: plugins/personal/samba/class_sambaAccount.inc:450
 #: plugins/admin/systems/class_terminalGeneric.inc:62
-#: plugins/admin/systems/class_workstationGeneric.inc:70
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:545
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:543
+#: plugins/personal/posix/class_posixAccount.inc:546
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:712
+#: plugins/personal/posix/class_posixAccount.inc:715
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:871
+#: plugins/personal/posix/class_posixAccount.inc:874
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:874
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:882
+#: plugins/personal/posix/class_posixAccount.inc:885
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: plugins/personal/posix/class_posixAccount.inc:888
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:889
-#: plugins/admin/groups/class_groupGeneric.inc:617
+#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:642
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:892
-#: plugins/admin/groups/class_groupGeneric.inc:620
+#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:645
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:903
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:913
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:913
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:935
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1036
-#: plugins/admin/groups/class_groupGeneric.inc:651
+#: plugins/personal/posix/class_posixAccount.inc:1039
+#: plugins/admin/groups/class_groupGeneric.inc:676
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1496,140 +1599,144 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
+#: plugins/personal/generic/class_user.inc:248
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
+#: plugins/personal/generic/class_user.inc:248
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:243
+#: plugins/personal/generic/class_user.inc:262
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:272
+#: plugins/personal/generic/class_user.inc:291
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:387
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:424
 #, php-format
 msgid ""
 "Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:424
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:424
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:428
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:808
+#: plugins/personal/generic/class_user.inc:835
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:825
+#: plugins/personal/generic/class_user.inc:852
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:836
+#: plugins/personal/generic/class_user.inc:863
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:876
+#: plugins/personal/generic/class_user.inc:893
+msgid "Invalid characters in uid."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:907
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:881
+#: plugins/personal/generic/class_user.inc:912
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:887
+#: plugins/personal/generic/class_user.inc:918
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:529
+#: plugins/admin/users/class_userManagement.inc:543
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:927
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:902
+#: plugins/personal/generic/class_user.inc:933
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:546
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:905
+#: plugins/personal/generic/class_user.inc:936
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/generic/class_user.inc:943
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/generic/class_user.inc:950
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:922
+#: plugins/personal/generic/class_user.inc:953
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
+#: 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
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
+#: 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
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
+#: 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:939
+#: plugins/personal/generic/class_user.inc:970
 #: plugins/addons/addressbook/class_addressbook.inc:551
 #: plugins/admin/departments/class_departmentGeneric.inc:172
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:942
+#: plugins/personal/generic/class_user.inc:973
 #: plugins/addons/addressbook/class_addressbook.inc:554
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:945
+#: plugins/personal/generic/class_user.inc:976
 #: plugins/addons/addressbook/class_addressbook.inc:557
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1070
+#: plugins/personal/generic/class_user.inc:1103
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -1654,24 +1761,20 @@ msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/environment/logonManagement.tpl:10
-#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: 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/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:98
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:112
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:7
-#: plugins/admin/FAI/faiPartitionTable.tpl:9 plugins/admin/FAI/faiScript.tpl:9
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/FAI/faiVariableEntry.tpl:9
-#: plugins/admin/FAI/faiTemplate.tpl:9 plugins/admin/FAI/faiHookEntry.tpl:9
-#: plugins/admin/FAI/faiVariable.tpl:9 plugins/admin/FAI/faiScriptEntry.tpl:9
-#: plugins/admin/FAI/faiTemplateEntry.tpl:9 plugins/admin/FAI/faiHook.tpl:9
-#: plugins/admin/FAI/faiProfile.tpl:6 plugins/admin/FAI/faiPackage.tpl:9
-#: plugins/gofon/macro/parameter.tpl:5
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: 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:150
+#: html/getxls.php:195 html/getxls.php:204 html/getxls.php:207
 msgid "Name"
 msgstr ""
 
@@ -1706,29 +1809,33 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:195
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:92
+#: plugins/personal/generic/generic.tpl:91
+msgid "Preferred langage"
+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/departments/generic.tpl:27
 #: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:29
-#: plugins/admin/systems/workstation.tpl:18
+#: 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/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:96
+#: plugins/personal/generic/generic.tpl:106
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:111
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:121
+#: plugins/personal/generic/generic.tpl:265
 #: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
@@ -1737,51 +1844,51 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:115
+#: plugins/personal/generic/generic.tpl:125
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/generic.tpl:129
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:128
+#: plugins/personal/generic/generic.tpl:138
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/generic.tpl:148
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:140
+#: plugins/personal/generic/generic.tpl:150
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:144
+#: plugins/personal/generic/generic.tpl:154
 msgid "Kerberos"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:145
+#: plugins/personal/generic/generic.tpl:155
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:161
+#: plugins/personal/generic/generic.tpl:171
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:173
+#: plugins/personal/generic/generic.tpl:183 html/getxls.php:207
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:177
+#: plugins/personal/generic/generic.tpl:187
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: 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
@@ -1789,99 +1896,100 @@ msgstr ""
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:181
+#: plugins/personal/generic/generic.tpl:191
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:187
+#: plugins/personal/generic/generic.tpl:197
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:193
+#: plugins/personal/generic/generic.tpl:203
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:209
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/generic.tpl:219
+#: plugins/personal/generic/generic.tpl:358
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:221
+#: 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
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:225
+#: plugins/personal/generic/generic.tpl:235
 #: plugins/addons/addressbook/address_edit.tpl:102
-#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:150
+#: html/getxls.php:207
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:247
+#: plugins/personal/generic/generic.tpl:257
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/printer.tpl:49
+#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:150
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/admin/departments/generic.tpl:46
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:150
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:279
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:283
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:281
+#: plugins/personal/generic/generic.tpl:291
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:289
+#: plugins/personal/generic/generic.tpl:299
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:296
+#: plugins/personal/generic/generic.tpl:306
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:318
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:326
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:333
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/generic.tpl:339
 #: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:150
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:345
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:367
 msgid "Please use the phone tab"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:370
+#: plugins/personal/generic/generic.tpl:380
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:377
+#: plugins/personal/generic/generic.tpl:387
 msgid "Public visible"
 msgstr ""
 
@@ -1890,15 +1998,10 @@ 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:85
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:38
-#: plugins/admin/FAI/faiVariableEntry.tpl:48
-#: plugins/admin/FAI/faiHookEntry.tpl:58
-#: plugins/admin/FAI/faiScriptEntry.tpl:69
-#: plugins/admin/FAI/faiTemplateEntry.tpl:58
+#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 msgid "Save"
 msgstr ""
 
@@ -1910,10 +2013,15 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: 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/FAI/class_faiPartitionTableEntry.inc:251
+#: 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
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -1934,7 +2042,7 @@ msgstr ""
 msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:187
+#: plugins/personal/generic/main.inc:189
 msgid "Generic user information"
 msgstr ""
 
@@ -2153,7 +2261,7 @@ msgid "Download bandwidth"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:31
-#: plugins/personal/environment/environment.tpl:53
+#: plugins/personal/environment/environment.tpl:65
 msgid "Quota"
 msgstr ""
 
@@ -2266,66 +2374,65 @@ msgstr ""
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:204
-#: plugins/personal/environment/class_environment.inc:236
+#: plugins/personal/environment/class_environment.inc:214
+#: plugins/personal/environment/class_environment.inc:250
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:205
-#: plugins/personal/environment/class_environment.inc:237
-msgid ""
-"This server has environment extension enabled. You can disable it by "
-"clicking below."
+#: 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."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:209
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:241
-#: plugins/personal/environment/class_environment.inc:246
+#: 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"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:210
-#: plugins/personal/environment/class_environment.inc:242
-msgid ""
-"This server has environment extension disabled. You can enable it by "
-"clicking below."
+#: 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."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:215
-#: plugins/personal/environment/class_environment.inc:247
+#: plugins/personal/environment/class_environment.inc:230
+#: plugins/personal/environment/class_environment.inc:263
 msgid ""
-"This server has environment extension disabled. You have to setup a posix "
-"account before you can enable this feature."
+"Environment extension disabled. You have to setup a posix account before you "
+"can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:410
+#: 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."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:622
+#: plugins/personal/environment/class_environment.inc:679
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:629
+#: plugins/personal/environment/class_environment.inc:686
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:651
+#: plugins/personal/environment/class_environment.inc:708
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:725
+#: plugins/personal/environment/class_environment.inc:801
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:804
+#: plugins/personal/environment/class_environment.inc:871
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:966
+#: plugins/personal/environment/class_environment.inc:986
 msgid "Admin"
 msgstr ""
 
@@ -2333,100 +2440,99 @@ msgstr ""
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:6
+#: plugins/personal/environment/environment.tpl:8
+#: plugins/personal/environment/environment.tpl:100
+#: plugins/personal/environment/environment.tpl:146
 msgid "Environment managment settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:9
-msgid "Profiles"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:10
+#: plugins/personal/environment/environment.tpl:11
 msgid "Profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:17
+#: plugins/personal/environment/environment.tpl:18
 msgid "Use profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:24
+#: plugins/personal/environment/environment.tpl:25
 msgid "Profile server managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:27
-msgid "Profil server"
+#: plugins/personal/environment/environment.tpl:28
+msgid "Profil path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:39
-msgid "Use local caching"
+#: plugins/personal/environment/environment.tpl:42
+msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:62
-#: plugins/admin/systems/service.tpl:94
-msgid "Resolution"
+#: plugins/personal/environment/environment.tpl:51
+msgid "Kiosk profile settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:54
+msgid "Kiosk profile"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:60
+msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:76
+#: plugins/personal/environment/environment.tpl:79
 msgid "Resolution changeable on runtime"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/environment.tpl:86
-msgid "Kiosk profile"
+#: plugins/personal/environment/environment.tpl:84
+#: plugins/admin/systems/workstationService.tpl:94
+#: plugins/admin/systems/terminalService.tpl:94
+msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:83
-msgid "Kiosk profile settings"
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:78
+#: plugins/admin/systems/terminalStartup.tpl:66
+msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:99
-msgid "Profile management"
+#: plugins/personal/environment/environment.tpl:116
+#: plugins/admin/systems/workstationStartup.tpl:91
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:104
+#: plugins/personal/environment/environment.tpl:124
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/environment.tpl:125
+#: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:122
-msgid "Attach share"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:142
+#: plugins/personal/environment/environment.tpl:149
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:143
+#: plugins/personal/environment/environment.tpl:150
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:160
 #: plugins/admin/groups/class_groupManagement.inc:354
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:154
+#: plugins/personal/environment/environment.tpl:161
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:161
+#: plugins/personal/environment/environment.tpl:169
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:171
+#: plugins/personal/environment/environment.tpl:179
 msgid "Admin Toggle"
 msgstr ""
 
@@ -2451,72 +2557,50 @@ msgid "Please select an entry or press cancel."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:1
-msgid "Select hotplug entry"
+msgid "Add hotplug devices"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:5
 msgid "Hotplug management"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/generic.tpl:67
-#: 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:24
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/admin/FAI/headpage.tpl:20
-#: plugins/admin/FAI/faiProfileEntry.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-#: plugins/gofon/conference/headpage.tpl:20
-msgid "Information"
+#: plugins/personal/environment/hotplugDialog.tpl:10
+msgid "Select hotplug device to add"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:28
-msgid "This menu allows you to select an existing hotplug configuration."
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialog.tpl:40
-msgid "Display hotplugs of department"
+msgid ""
+"This menu allows you to select existing hotplug devices. All devices of all "
+"users are choosable here."
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/personal/environment/hotplugDialog.tpl:44
 msgid "Choose the department the search will be based    on"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:57
+#: plugins/personal/environment/hotplugDialog.tpl:53
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/users/headpage.tpl:48
-#: plugins/gofon/conference/headpage.tpl:34
+#: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:62
+#: plugins/personal/environment/hotplugDialog.tpl:58
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:75
-#: plugins/personal/environment/selectPrinterDialog.tpl:74
-#: plugins/personal/environment/logonManagement.tpl:77
-#: plugins/admin/FAI/askClassName.tpl:27 plugins/admin/FAI/askClassName.tpl:44
-msgid "Use"
-msgstr ""
-
 #: plugins/personal/environment/class_selectPrinterDialog.inc:64
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
 msgid "Please select a printer or press cancel."
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
-msgid "Select printer entry"
+msgid "Add printer devcies"
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:5
 #: plugins/personal/environment/selectPrinterDialog.tpl:10
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:5
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
 msgid "Select printer to add"
 msgstr ""
 
@@ -2527,69 +2611,64 @@ msgid ""
 "range selectors on top of the printers list."
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:41
-msgid "Display printers of department"
-msgstr ""
-
-#: plugins/personal/environment/selectPrinterDialog.tpl:58
+#: plugins/personal/environment/selectPrinterDialog.tpl:54
 msgid "Display printers matching"
 msgstr ""
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:59
 msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:1
-msgid "Logon management"
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr ""
 
+#: plugins/personal/environment/logonManagement.tpl:10
+msgid "Skript name"
+msgstr ""
+
 #: plugins/personal/environment/logonManagement.tpl:17
-#: plugins/personal/environment/hotplugDialogNew.tpl:14
+#: 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/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:18
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
 #: plugins/admin/ogroups/generic.tpl:13
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:18
-#: plugins/admin/FAI/faiPartitionTable.tpl:19
-#: plugins/admin/FAI/faiScript.tpl:19
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:193
-#: plugins/admin/FAI/faiVariableEntry.tpl:17
-#: plugins/admin/FAI/faiTemplate.tpl:19 plugins/admin/FAI/faiHookEntry.tpl:17
-#: plugins/admin/FAI/faiVariable.tpl:19
-#: plugins/admin/FAI/faiScriptEntry.tpl:17
-#: plugins/admin/FAI/faiTemplateEntry.tpl:17 plugins/admin/FAI/faiHook.tpl:19
-#: plugins/admin/FAI/faiProfile.tpl:16 plugins/admin/FAI/faiPackage.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiVariableEntry.tpl:17
+#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
-#: plugins/generic/references/contents.tpl:11
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:103
+#: html/getxls.php:201
 msgid "Description"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:24
-#: plugins/admin/FAI/faiScriptEntry.tpl:34
+#: plugins/admin/fai/faiScriptEntry.tpl:34
 msgid "Priority"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:35
+#: plugins/personal/environment/logonManagement.tpl:34
 msgid "Logon script flags"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:40
+#: plugins/personal/environment/logonManagement.tpl:38
 msgid "Last script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:48
-msgid "Overloadable"
+#: plugins/personal/environment/logonManagement.tpl:44
+msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:65
+#: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
 
@@ -2602,15 +2681,23 @@ msgid "Specified description contains invalid characters."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
-#: plugins/personal/environment/hotplugDialogNew.tpl:5
 msgid "Create new hotplug entry"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:21
-msgid "ID"
+#: plugins/personal/environment/hotplugDialogNew.tpl:8
+msgid "Create new hotplug device"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:10
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Device ID"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:29
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
 msgid "save"
 msgstr ""
 
@@ -2624,9 +2711,14 @@ msgstr ""
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:80
+#: plugins/personal/environment/class_kioskManagementDialog.inc:81
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:87
 #, php-format
-msgid "Can't open '%s'. Error was: permission denied."
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
@@ -2641,11 +2733,99 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:22
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:19
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:59
 msgid "Close"
 msgstr ""
 
+#: plugins/personal/nagios/main.inc:124
+msgid "User nagios settings"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:82
+msgid "This account has no nagios extensions."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:91
+msgid "Remove nagios account"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:94
+msgid "Create nagios account"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:94
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:169
+msgid "The required field 'NagiosAlias' is not set."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+msgid "The required field 'NagiosMail' is not set."
+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."
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "alias"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:12
+msgid "email"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host Notification Period"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service Notification Period"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service Notification Options"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host Notification Options"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:48
+msgid "pager"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service Notification Commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host Notification Commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios Auth"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:68
+msgid "authorized_for_system_information"
+msgstr ""
+
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr ""
@@ -2659,9 +2839,12 @@ msgid "Select subtree to place blocklist in"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/servnfs.tpl:31
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:176
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr ""
@@ -2701,74 +2884,78 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
+#: 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:553
+#: 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:286
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 msgid "Go up one department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/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:553
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
+#: plugins/admin/systems/class_systemManagement.inc:562
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: 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:286
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/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:554
+#: 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:287
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "Go to root department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/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:554
+#: 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:287
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "Root"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: 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:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 msgid "Go to users department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/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:555
+#: 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:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 msgid "Home"
 msgstr ""
 
@@ -2782,75 +2969,78 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:659
+#: 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:564
+#: 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:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
 msgid "Current base"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/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:565
+#: 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:293
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "Submit department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/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:565
+#: 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:293
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "Submit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:663
+#: plugins/admin/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:570
+#: plugins/admin/systems/class_systemManagement.inc:579
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/admin/FAI/class_faiManagement.inc:401
+#: plugins/admin/fai/class_faiManagement.inc:471
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:663
+#: plugins/admin/users/class_userManagement.inc:677
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:665
+#: plugins/admin/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:571
+#: plugins/admin/systems/class_systemManagement.inc:580
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/FAI/class_faiManagement.inc:402
+#: plugins/admin/fai/class_faiManagement.inc:472
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:665
+#: plugins/admin/users/class_userManagement.inc:679
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr ""
@@ -2862,13 +3052,14 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:674
+#: 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:578
+#: 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:313
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
 msgid "Actions"
 msgstr ""
 
@@ -2909,9 +3100,9 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/admin/FAI/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
+#: html/index.php:227 ihtml/themes/altlinux/conflict.tpl:6
 #: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 #: ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
@@ -2976,7 +3167,8 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:54
+#: html/getxls.php:195
 msgid "Language"
 msgstr ""
 
@@ -3072,7 +3264,14 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1276
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiHookEntry.tpl:69
+#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: plugins/admin/fai/faiPackageEntry.tpl:65 include/functions.inc:1276
 msgid "Apply"
 msgstr ""
 
@@ -3150,8 +3349,9 @@ msgid "FAX ID"
 msgstr ""
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:513
+#: plugins/admin/systems/class_printGeneric.inc:560
 #: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr ""
 
@@ -3357,7 +3557,8 @@ msgid "Personal"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:150
+#: html/getxls.php:207
 msgid "Initials"
 msgstr ""
 
@@ -3377,7 +3578,8 @@ msgid "Company"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:150
+#: html/getxls.php:207
 msgid "City"
 msgstr ""
 
@@ -3463,11 +3665,13 @@ msgstr ""
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:150
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:66
+#: html/getxls.php:88 html/getxls.php:103 html/getxls.php:239
+#: html/getxls.php:254
 msgid "User ID"
 msgstr ""
 
@@ -3604,6 +3808,7 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:10
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
 msgid "Export single entry"
 msgstr ""
 
@@ -3613,14 +3818,18 @@ msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:24
 #: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexportxls.tpl:27
+#: plugins/addons/ldapmanager/contentexportxls.tpl:42
 msgid "Choose the department you want to Export"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:36
+#: plugins/addons/ldapmanager/contentexportxls.tpl:39
 msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:55
+#: plugins/addons/ldapmanager/contentexportxls.tpl:58
 msgid "Export successful"
 msgstr ""
 
@@ -3646,9 +3855,41 @@ msgid "You've no permission to do LDAP exports."
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_export.inc:80
+#: plugins/addons/ldapmanager/class_exportxls.inc:85
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+msgid ""
+"The XLS export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as xls. You may save these files for "
+"documentation."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+msgid "Choose the data you want to Export"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+msgid "Export complete XLS for"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the complete LDAP database to a xls file"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the LDAP Export to a xls file"
+msgstr ""
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
+msgid "XLS export"
+msgstr ""
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:35
+msgid "You've no permission to do XLS exports."
+msgstr ""
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr ""
@@ -3740,48 +3981,48 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
+#: 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:155
+#: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
+#: plugins/admin/groups/class_groupGeneric.inc:266
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
+#: plugins/admin/groups/class_groupGeneric.inc:266
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
+#: plugins/admin/groups/class_groupGeneric.inc:266
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:261
+#: plugins/admin/groups/class_groupGeneric.inc:267
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:272
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
+#: plugins/admin/groups/class_groupGeneric.inc:606
+#: plugins/admin/ogroups/class_ogroup.inc:523
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
+#: plugins/admin/groups/class_groupGeneric.inc:616
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:627
+#: plugins/admin/groups/class_groupGeneric.inc:634
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -3825,7 +4066,8 @@ msgid "Group administration"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:80
+#: html/getxls.php:213
 msgid "Groups"
 msgstr ""
 
@@ -3847,7 +4089,7 @@ msgstr ""
 #: 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:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "Edit this entry"
 msgstr ""
 
@@ -3855,13 +4097,13 @@ msgstr ""
 #: 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:298
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:724
 msgid "Posix"
 msgstr ""
 
@@ -3878,11 +4120,12 @@ msgid "Groupname"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:687
 #: 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/fai/faiScriptEntry.tpl:29
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -3985,11 +4228,11 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:54
+#: plugins/admin/groups/class_groupAcl.inc:55
 msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:199
+#: plugins/admin/groups/class_groupAcl.inc:200
 msgid "All fields are writeable"
 msgstr ""
 
@@ -4033,7 +4276,11 @@ msgstr ""
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:77
+msgid "Members are in a nagios group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:92
 msgid "Group members"
 msgstr ""
 
@@ -4097,13 +4344,14 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:993
-#: plugins/admin/systems/class_systemManagement.inc:699
-#: plugins/admin/FAI/class_faiManagement.inc:459
+#: plugins/admin/users/class_userManagement.inc:1010
+#: plugins/admin/systems/class_systemManagement.inc:703
 msgid "Template"
 msgstr ""
 
 #: plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:387
+#: 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
@@ -4120,7 +4368,7 @@ msgid "User administration"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:80
+#: plugins/admin/systems/printer.tpl:65 html/getxls.php:56 html/getxls.php:212
 msgid "Users"
 msgstr ""
 
@@ -4139,36 +4387,37 @@ msgstr ""
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:474
-#: plugins/admin/ogroups/class_ogroup.inc:201
+#: plugins/admin/users/class_userManagement.inc:485
+#: plugins/admin/systems/class_workstationStartup.inc:49
+#: plugins/admin/ogroups/class_ogroup.inc:232
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:555
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:670
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:670
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:671
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:671
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:678
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -4177,55 +4426,55 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/users/class_userManagement.inc:691
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:722
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:727
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:731
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:719
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:721
+#: plugins/admin/users/class_userManagement.inc:735
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/class_userManagement.inc:736
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:737
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:792
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:785
+#: plugins/admin/users/class_userManagement.inc:799
 msgid "Offline"
 msgstr ""
 
@@ -4251,7 +4500,7 @@ msgstr ""
 msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/FAI/headpage.tpl:37
+#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:37
 msgid "Show templates"
 msgstr ""
 
@@ -4303,8 +4552,9 @@ msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
 #: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
-#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr ""
 
@@ -4337,22 +4587,28 @@ msgstr ""
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:61
+#: plugins/admin/applications/generic.tpl:62
 msgid "Only executable for members"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/applications/generic.tpl:64
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:67
+#: plugins/admin/applications/generic.tpl:68
 msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:71
 msgid "Place entry in members startmenu"
 msgstr ""
 
+#: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
+msgid "Upload"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationParameters.inc:47
 msgid "Remove options"
 msgstr ""
@@ -4437,39 +4693,43 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
+#: plugins/admin/applications/class_applicationGeneric.inc:82
+msgid "no example"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:97
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:160
+#: plugins/admin/applications/class_applicationGeneric.inc:213
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:241
+#: plugins/admin/applications/class_applicationGeneric.inc:294
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:246
+#: plugins/admin/applications/class_applicationGeneric.inc:299
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:250
+#: plugins/admin/applications/class_applicationGeneric.inc:303
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:254
+#: plugins/admin/applications/class_applicationGeneric.inc:307
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:263
+#: plugins/admin/applications/class_applicationGeneric.inc:316
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:30
-#: plugins/admin/FAI/tabsPartition.inc:33 plugins/admin/FAI/tabsHook.inc:30
-#: plugins/admin/FAI/tabsScript.inc:30 plugins/admin/FAI/tabsTemplate.inc:30
-#: plugins/admin/FAI/tabsVariable.inc:30 plugins/admin/FAI/tabsPackage.inc:30
-#: plugins/admin/FAI/tabsProfile.inc:30
+#: plugins/admin/fai/tabsHook.inc:30 plugins/admin/fai/tabsPartition.inc:33
+#: plugins/admin/fai/tabsVariable.inc:30 plugins/admin/fai/tabsPackage.inc:30
+#: plugins/admin/fai/tabsTemplate.inc:30 plugins/admin/fai/tabsProfile.inc:30
+#: plugins/admin/fai/tabsScript.inc:30
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -4482,7 +4742,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:57
+#: plugins/gofon/conference/generic.tpl:56
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -4528,7 +4788,7 @@ msgid ""
 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/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:11
 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 "
@@ -4576,6 +4836,7 @@ msgid "You have no permission to remove this department."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:279
+#: plugins/admin/fai/class_faiManagement.inc:423
 msgid "Go to users home department"
 msgstr ""
 
@@ -4592,6 +4853,7 @@ msgid "Department name"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/fai/class_faiManagement.inc:492
 msgid "department"
 msgstr ""
 
@@ -4627,8 +4889,10 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:62
 #: plugins/admin/systems/class_terminalService.inc:136
-#: plugins/admin/systems/class_terminalStartup.inc:75
+#: 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
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -4668,7 +4932,7 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:240
+#: plugins/admin/systems/class_servService.inc:259
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
@@ -4688,10 +4952,10 @@ 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:254
+#: plugins/admin/systems/class_terminalGeneric.inc:257
 #: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:399
+#: 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
 #, php-format
@@ -4750,7 +5014,9 @@ msgstr ""
 msgid "CDROM device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:73 plugins/admin/systems/service.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
 msgstr ""
 
@@ -4831,48 +5097,59 @@ msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:83
+#: plugins/admin/systems/class_workstationService.inc:68
 msgid "default"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:84
+#: plugins/admin/systems/class_workstationService.inc:69
 msgid "show chooser"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:85
+#: plugins/admin/systems/class_workstationService.inc:70
 msgid "direct"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:88
+#: plugins/admin/systems/class_workstationService.inc:73
 msgid "load balanced"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:76
 msgid "Windows RDP"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:92
+#: plugins/admin/systems/class_workstationService.inc:77
 msgid "ICA client"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:184
+#: plugins/admin/systems/class_workstationService.inc:168
 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
 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
 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:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
+#: plugins/admin/systems/class_servDB.inc:157
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:168
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
@@ -4886,7 +5163,12 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:152
+#, php-format
+msgid "The specified kerberos password is empty."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:176
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
@@ -4896,15 +5178,15 @@ msgid "Server name"
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:31
-#: plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:29
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr ""
@@ -4926,74 +5208,67 @@ msgid "Terminal name"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/workstation.tpl:45
 #: plugins/admin/systems/phonesettings.tpl:25
 msgid "Mode"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
+#: plugins/admin/systems/workstation.tpl:47
 msgid "Select terminal mode"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
 msgid "Root server"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
 msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
 msgid "Swap server"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
+#: plugins/admin/systems/workstation.tpl:54
 msgid "Syslog server"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
+#: plugins/admin/systems/workstation.tpl:56
 msgid "Choose server to use for logging"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
+#: plugins/admin/systems/workstation.tpl:62
 msgid "NTP server"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
+#: plugins/admin/systems/workstation.tpl:64
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/workstation.tpl:82
 msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
-#: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:64
-#: plugins/admin/systems/class_workstationGeneric.inc:72
 msgid "graphic"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:89
 #: plugins/admin/systems/class_servGeneric.inc:59
-#: plugins/admin/systems/class_workstationGeneric.inc:98
 #: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
@@ -5004,9 +5279,7 @@ msgstr ""
 #: 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:102
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: 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
@@ -5016,44 +5289,42 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:101
 #: plugins/admin/systems/class_servGeneric.inc:71
-#: plugins/admin/systems/class_workstationGeneric.inc:110
 #: plugins/admin/ogroups/class_termgroup.inc:71
 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/systems/class_workstationGeneric.inc:122
 #: plugins/admin/ogroups/class_termgroup.inc:83
 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:152
+#: plugins/admin/systems/class_workstationGeneric.inc:123
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:144
 #: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:123
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:146
 #: plugins/admin/systems/class_servGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:128
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:237
+#: plugins/admin/systems/class_terminalGeneric.inc:240
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:241
+#: plugins/admin/systems/class_terminalGeneric.inc:244
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
@@ -5093,47 +5364,90 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:14
+#: plugins/admin/systems/printer.tpl:9
 msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:30
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/printer.tpl:33
+msgid "Printer location"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:37
 msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:61
-msgid "PPD"
+#: plugins/admin/systems/printer.tpl:45
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/printer.tpl:57
 msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:79
-msgid "Following objects are assigned as user."
+#: plugins/admin/systems/printer.tpl:64
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:96
-msgid "Following objects are assigned as admin."
+#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
+msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:97
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+msgid "Add group"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:80
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:81
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:136
+#: 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:225
+#: 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:229
+#: plugins/admin/systems/class_workstationGeneric.inc:198
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
@@ -5141,224 +5455,225 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:322
+#: plugins/admin/systems/class_systemManagement.inc:331
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:338
+#: plugins/admin/systems/class_systemManagement.inc:347
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:351
+#: plugins/admin/systems/class_systemManagement.inc:360
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:395
-#: plugins/admin/FAI/class_faiManagement.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:404
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:401
-#: plugins/admin/systems/class_systemManagement.inc:465
-#: plugins/admin/FAI/class_faiManagement.inc:171
-#: plugins/admin/FAI/class_faiManagement.inc:204
+#: 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
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:557
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:566
+msgid "New Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/systems/class_systemManagement.inc:708
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:567
+msgid "New Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:709
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:559
+#: plugins/admin/systems/class_systemManagement.inc:568
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:569
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:579
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:580
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/class_systemManagement.inc:586
 msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:581
-#: plugins/admin/FAI/class_faiManagement.inc:392
+#: plugins/admin/systems/class_systemManagement.inc:590
+#: plugins/admin/fai/class_faiManagement.inc:462
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:614
+#: plugins/admin/systems/class_systemManagement.inc:623
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:615
+#: plugins/admin/systems/class_systemManagement.inc:624
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:625
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:626
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:628
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:630
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:632
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/class_systemManagement.inc:658
 msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:700
+#: plugins/admin/systems/class_systemManagement.inc:704
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:701
+#: plugins/admin/systems/class_systemManagement.inc:705
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:710
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:711
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:917
+#: plugins/admin/systems/class_systemManagement.inc:928
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_systemManagement.inc:931
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:937
+#: plugins/admin/systems/class_systemManagement.inc:948
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:948
+#: plugins/admin/systems/class_systemManagement.inc:960
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:167
-#: plugins/admin/systems/class_printGeneric.inc:183
 #: plugins/admin/systems/class_printGeneric.inc:186
+#: plugins/admin/systems/class_printGeneric.inc:207
+#: plugins/admin/systems/class_printGeneric.inc:210
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:168
+#: plugins/admin/systems/class_printGeneric.inc:187
 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:175
-#: plugins/admin/systems/class_printGeneric.inc:178
+#: plugins/admin/systems/class_printGeneric.inc:199
+#: plugins/admin/systems/class_printGeneric.inc:202
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:176
+#: plugins/admin/systems/class_printGeneric.inc:200
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:179
+#: plugins/admin/systems/class_printGeneric.inc:203
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:208
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:187
+#: plugins/admin/systems/class_printGeneric.inc:211
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:197
+#: plugins/admin/systems/class_printGeneric.inc:222
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:315
-msgid "Undefined"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:326
+#: plugins/admin/systems/class_printGeneric.inc:364
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:366
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:332
-msgid ""
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:389
+#: plugins/admin/systems/class_printGeneric.inc:428
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:508
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:555
+#: plugins/admin/systems/class_printGeneric.inc:557
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5677,165 +5992,6 @@ msgstr ""
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/service.tpl:4
-msgid "Keyboard"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
-msgid "Model"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:9
-msgid "Choose keyboard model"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:15
-msgid "Layout"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:17
-msgid "Choose keyboard layout"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:23
-msgid "Variant"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:25
-msgid "Choose keyboard variant"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:39
-msgid "Mouse"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:44
-msgid "Choose mouse type"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:50
-msgid "Port"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:52
-msgid "Choose mouse port"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-msgid "Telephone"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:86
-msgid "Driver"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:102
-msgid "Color depth"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:117
-msgid "Display device"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:124
-msgid "HSync"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:129
-msgid "VSync"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:141
-msgid "Remote desktop"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:145
-msgid "Connect method"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:154
-msgid "Terminal server"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:156
-msgid "Select specific terminal server to use"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:163
-msgid "Font server"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:165
-msgid "Select specific font server to use"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:181
-msgid "Print device"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:183
-msgid "Provide print services"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:189
-msgid "Spool server"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:203
-msgid "Scan device"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:205
-msgid "Provide scan services"
-msgstr ""
-
-#: plugins/admin/systems/service.tpl:212
-msgid "Select scanner driver to use"
-msgstr ""
-
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -5858,10 +6014,6 @@ msgstr ""
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
-msgstr ""
-
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr ""
@@ -5904,203 +6056,255 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:1
-msgid "Boot parameters"
+#: plugins/admin/systems/class_phoneGeneric.inc:102
+msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:8
-msgid "LDAP server"
+#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
+#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:17
-msgid "Boot kernel"
+#: plugins/admin/systems/class_phoneGeneric.inc:195
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:19
-msgid "Enter the filename of the kernel to use"
+#: plugins/admin/systems/class_phoneGeneric.inc:195
+msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:22
-msgid "Custom options"
+#: plugins/admin/systems/class_phoneGeneric.inc:213
+#, 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/startup.tpl:24
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+#: plugins/admin/systems/class_phoneGeneric.inc:270
+msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_phoneGeneric.inc:273
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:36
-msgid "use graphical bootup"
+#: plugins/admin/systems/class_phoneGeneric.inc:282
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:38
-msgid "Select if terminal should boot in text mode"
+#: plugins/admin/systems/class_phoneGeneric.inc:289
+msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:39
-msgid "use standard linux textual bootup"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:42
-msgid "use debug mode for startup"
+#: 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
+msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:53
-msgid "Kernel modules (format: name parameters)"
+#: plugins/admin/systems/phonesettings.tpl:13
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:55
-msgid "Add additional modules to load on startup"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:67
-msgid "Automount devices (format: complete autofs entry)"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:69
-msgid "Add additional automount entries"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:87
-msgid "Additional fstab entries"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:89
-msgid "Add additional filesystems to be mounted during startup"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:102
-msgid "This 'dn' has no phone features."
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
-msgid "dynamic"
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
-msgid "Networksettings"
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:213
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:270
-msgid "The required field 'Phone name' is not set."
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
-msgid "The 'Phone name' '0' is reserved and cannot be used."
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:289
-msgid "You have no permissions to create a phone on this 'Base'."
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+msgid "Model"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
 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
-msgid "Choose a phone type"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:13
-msgid "refresh"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+msgid "Telephone hardware"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
+#: plugins/admin/systems/workstationService.tpl:124
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:126
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:129
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:131
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:143
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:144
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:145
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
 msgstr ""
 
 #: plugins/admin/systems/class_servNfs.inc:101
@@ -6136,7 +6340,6 @@ msgid "Charset"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:63
-#: plugins/admin/FAI/faiTemplateEntry.tpl:34
 msgid "Path"
 msgstr ""
 
@@ -6144,86 +6347,272 @@ msgstr ""
 msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:2
-msgid "Printer driver information file setup"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:7
-msgid "Current used information setup : "
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:13
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
 msgid "Select"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
-msgid "Select entry"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
-msgid "Select user/group to add"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
 msgid ""
-"This menu allows you to select one or multiple users or groups to add them "
-"to the printer. \n"
-"\t\t\t\t\t\t\tHaving a great number of users, you may want to use the range "
-"selectors on top of this list."
+"This menu allows you to select one or multiple entries to be added to the "
+"printer object for specific tasks. Having a great number of entries, you may "
+"want to use the range selectors below."
 msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
 msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
 msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
 msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
-msgid "Reset list"
+#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#, php-format
+msgid "Can't open '%s', ppd settings reseted."
+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_printerPPDSelectionDialog.inc:87
-msgid "Upload PPD"
+#: plugins/admin/systems/class_printerPPDDialog.inc:113
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:92
-msgid "List with all available ppd files."
+#: plugins/admin/systems/class_printerPPDDialog.inc:120
+#, php-format
+msgid "Can't save file '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
-msgid "Entries"
+#: plugins/admin/systems/class_printerPPDDialog.inc:136
+#: plugins/admin/systems/class_printerPPDDialog.inc:139
+msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:117
-msgid "selected"
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+msgid "Please select a valid ppd."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
-msgid "Please select a PPD or press cancel"
+#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/fai/faiPackage.tpl:41
+msgid "Section"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-msgid "List of PPDs"
+#: plugins/admin/systems/class_printerPPDDialog.inc:320
+#: plugins/admin/systems/class_printerPPDDialog.inc:323
+msgid "True"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/systems/class_printerPPDDialog.inc:321
+#: plugins/admin/systems/class_printerPPDDialog.inc:324
+msgid "False"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
+#: plugins/admin/systems/class_printerPPDDialog.inc:329
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
 
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/fai/faiProfileEntry.tpl:55
+#: plugins/admin/fai/faiProfileEntry.tpl:56 plugins/admin/fai/headpage.tpl:47
+#: plugins/admin/fai/faiPackageEntry.tpl:50
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:45
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/fai/faiProfileEntry.tpl:60 plugins/admin/fai/headpage.tpl:51
+#: plugins/admin/fai/faiPackageEntry.tpl:55
+msgid "Regular expression for matching object names"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:197
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:248
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configuratons."
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:10
+#: plugins/admin/systems/terminalStartup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:35
+msgid "FAI server"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/fai/faiPackage.tpl:57 plugins/admin/fai/faiPackageNew.tpl:59
+msgid "set"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:42
+msgid "Assigned FAI classes"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:65
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:67
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr ""
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:59
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:84
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+msgid "Terminals"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -6276,20 +6665,6 @@ msgstr ""
 msgid "Select to see phones"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/FAI/headpage.tpl:47 plugins/admin/FAI/faiProfileEntry.tpl:52
-msgid "Display objects matching"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/FAI/headpage.tpl:51 plugins/admin/FAI/faiProfileEntry.tpl:56
-msgid "Regular expression for matching object names"
-msgstr ""
-
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -6301,63 +6676,59 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:95
+#: plugins/admin/ogroups/class_ogroup.inc:124
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:203
+#: plugins/admin/ogroups/class_ogroup.inc:234
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
+#: plugins/admin/ogroups/class_ogroup.inc:236
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:206
+#: plugins/admin/ogroups/class_ogroup.inc:237
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
+#: plugins/admin/ogroups/class_ogroup.inc:238
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
+#: plugins/admin/ogroups/class_ogroup.inc:239
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
+#: plugins/admin/ogroups/class_ogroup.inc:241
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
+#: plugins/admin/ogroups/class_ogroup.inc:243
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:220
+#: plugins/admin/ogroups/class_ogroup.inc:251
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:371
+#: plugins/admin/ogroups/class_ogroup.inc:402
 msgid "Non existing dn: "
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
+#: plugins/admin/ogroups/class_ogroup.inc:533
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
@@ -6370,7 +6741,8 @@ msgstr ""
 msgid "UNIX accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:128
+#: html/getxls.php:134 html/getxls.php:214 html/getxls.php:270
 msgid "Servers"
 msgstr ""
 
@@ -6401,7 +6773,6 @@ msgid "Name of object groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/admin/FAI/class_faiManagement.inc:397
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -6518,75 +6889,86 @@ msgstr ""
 msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:114
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:160
+#: plugins/admin/ogroups/class_phonequeue.inc:161
 msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:198
+#: plugins/admin/ogroups/class_phonequeue.inc:199
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:233
-#: plugins/admin/ogroups/class_phonequeue.inc:596
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:76
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:273
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:947
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
+#: 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
+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."
+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
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:243
-#: plugins/admin/ogroups/class_phonequeue.inc:606
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:83
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:284
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:958
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: plugins/admin/ogroups/class_phonequeue.inc:249
+#: plugins/admin/ogroups/class_phonequeue.inc:623
+#: 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
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:274
-#: plugins/admin/ogroups/class_phonequeue.inc:478
-#: plugins/admin/ogroups/class_phonequeue.inc:642
+#: plugins/admin/ogroups/class_phonequeue.inc:280
+#: plugins/admin/ogroups/class_phonequeue.inc:494
+#: plugins/admin/ogroups/class_phonequeue.inc:659
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:507
-#: plugins/admin/ogroups/class_phonequeue.inc:509
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1058
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1060
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: 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
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
@@ -6716,686 +7098,813 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:11
-msgid "Choose a disc name"
+#: 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."
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:29
-msgid "Partition entries"
+#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
+msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:32
-msgid "Add partition"
+#: plugins/admin/fai/class_faiManagement.inc:32
+msgid "FAI"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:39
-msgid "cancel"
+#: plugins/admin/fai/class_faiManagement.inc:33
+msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:32
-#: plugins/admin/FAI/faiScript.tpl:32 plugins/admin/FAI/faiTemplate.tpl:32
-#: plugins/admin/FAI/faiVariable.tpl:32 plugins/admin/FAI/faiHook.tpl:32
-msgid "Objects"
+#: plugins/admin/fai/class_faiManagement.inc:201
+#, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:34
-msgid "This partition table contains following disks"
+#: plugins/admin/fai/class_faiManagement.inc:428
+msgid "New profile"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/fai/class_faiManagement.inc:428
+msgid "P"
 msgstr ""
 
-#: plugins/admin/FAI/faiScript.tpl:34 plugins/admin/FAI/faiTemplate.tpl:34
-#: plugins/admin/FAI/faiVariable.tpl:34 plugins/admin/FAI/faiHook.tpl:34
-msgid "This bundle contains following objects"
+#: plugins/admin/fai/class_faiManagement.inc:433
+msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/FAI/faiScript.tpl:40
-msgid "Choose a script to delete or edit"
+#: plugins/admin/fai/class_faiManagement.inc:433
+msgid "PT"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:6 plugins/admin/FAI/faiProfileEntry.tpl:6
-msgid "List of FAI objects (Fully Automatic Installation)"
+#: plugins/admin/fai/class_faiManagement.inc:436
+msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI objects."
+#: plugins/admin/fai/class_faiManagement.inc:436
+msgid "S"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:36
-msgid "Show profiles"
+#: plugins/admin/fai/class_faiManagement.inc:439
+msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:38
-msgid "Show scripts"
+#: plugins/admin/fai/class_faiManagement.inc:439
+msgid "H"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:39
-msgid "Show hooks"
+#: plugins/admin/fai/class_faiManagement.inc:442
+msgid "New variables"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:40
-msgid "Show variables"
+#: plugins/admin/fai/class_faiManagement.inc:442
+msgid "V"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:41
-msgid "Show packages"
+#: plugins/admin/fai/class_faiManagement.inc:445
+msgid "New templates"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:42
-msgid "Show partitions"
+#: plugins/admin/fai/class_faiManagement.inc:445
+msgid "T"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:191
-msgid "Nr"
+#: plugins/admin/fai/class_faiManagement.inc:448
+msgid "New package list"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:195
-msgid "FS type"
+#: plugins/admin/fai/class_faiManagement.inc:448
+msgid "PK"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:196
-msgid "Mount point"
+#: plugins/admin/fai/class_faiManagement.inc:466
+msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:197
-msgid "Size in MB"
+#: plugins/admin/fai/class_faiManagement.inc:467
+msgid "Class type"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:198
-msgid "Mount options"
+#: plugins/admin/fai/class_faiManagement.inc:471
+msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:199
-msgid "FS option"
+#: plugins/admin/fai/class_faiManagement.inc:472
+msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:200
-msgid "Preserve"
+#: 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
+msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:294
-msgid "Please enter a description for your disk."
+#: plugins/admin/fai/class_faiManagement.inc:521
+#: plugins/admin/fai/class_faiManagement.inc:522
+msgid "Package list"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:299
-#: plugins/admin/FAI/class_faiPartitionTable.inc:262
-#: plugins/admin/FAI/class_faiScript.inc:198
-#: plugins/admin/FAI/class_faiTemplate.inc:198
-#: plugins/admin/FAI/class_faiVariable.inc:198
-#: plugins/admin/FAI/class_faiHook.inc:199
-#: plugins/admin/FAI/class_faiProfile.inc:213
-#: plugins/admin/FAI/class_faiPackage.inc:110
-msgid "Please enter a valid description."
+#: plugins/admin/fai/class_faiManagement.inc:528
+#: plugins/admin/fai/class_faiManagement.inc:529
+msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:315
-#, php-format
-msgid "Please enter a valid name for partition %s."
+#: plugins/admin/fai/class_faiManagement.inc:549
+#: plugins/admin/fai/class_faiManagement.inc:550
+msgid "Profile"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:319
-#, php-format
-msgid "please enter a unique name for partition %s"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:323
-#, php-format
-msgid "please enter a unique mount point for partition %s"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:327
-#, php-format
-msgid "Please enter a valid description for partition %s."
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:331
-#, php-format
-msgid "Please enter a valid mount point for partition %s."
+#: 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
+msgid "Objects"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:336
-#, php-format
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+msgid "Discs"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:6
+msgid "List of FAI objects (Fully Automatic Installation)"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:27
 msgid ""
-"Fils system type 'swap' is already used, change file system type for "
-"partition %s."
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:342
-#, php-format
-msgid "Please enter a range for partition size, 'from-to', for partition %s."
+#: plugins/admin/fai/faiProfileEntry.tpl:40
+msgid "Show only classes with templates"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:42
+msgid "Show only classes with scripts"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:44
+msgid "Show only classes with hooks"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:46
+msgid "Show only classes with variables"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:48
+msgid "Show only classes with packages"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:50
+msgid "Show only classes with partitions"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:48
+#: plugins/admin/fai/class_faiHookEntry.inc:51
+msgid "Please select a valid file."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiHookEntry.inc:54
+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
+msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:344
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:346
+#: plugins/admin/fai/class_faiScriptEntry.inc:100
+msgid "Please enter a script."
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/admin/fai/faiScriptEntry.tpl:48
+msgid "Script attributes"
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+msgid "Choose a priority"
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:63
+#: plugins/admin/fai/faiHookEntry.tpl:63
+msgid "Import script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:118
+msgid "There is no useable package list defined."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:256
 #, php-format
-msgid "Please enter a valid range for partition %s."
+msgid "Can't read configuration folder '%s'."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:389
+#: plugins/admin/fai/class_faiPackage.inc:338
+msgid "Please select a least one Package."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:342
+msgid "Please choose a valid combination for your repository setup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:373
 #, php-format
-msgid ""
-"Size settings for partition %s, overlap with size settings for partition %s."
+msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:67
-msgid "Create new FAI object - partition table."
+#: plugins/admin/fai/faiPackage.tpl:29
+msgid "Repository"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:68
-msgid "Create new FAI object - package list."
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:29
+msgid "Release"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:69
-msgid "Create new FAI object - set of scripts."
+#: plugins/admin/fai/faiPackage.tpl:50
+msgid "Mirror"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:54 plugins/admin/fai/faiPackageNew.tpl:51
+msgid "mirror"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:67
+msgid "Used packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:69
+msgid "Choosen packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:75 include/functions.inc:587
+msgid "Configure"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:142
+#: plugins/admin/fai/class_faiProfileEntry.inc:148
+msgid "This list displays all assigned class names for this profile."
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:150
+msgid "Append new class names"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:153
+#: plugins/admin/fai/class_faiProfileEntry.inc:115
+msgid "Hook bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:116
+msgid "Template bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:155
+#: plugins/admin/fai/class_faiProfileEntry.inc:117
+msgid "Script bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfileEntry.inc:118
+msgid "Variable bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:157
+msgid "Packages bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:160
+msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:70
-msgid "Create new FAI object - set of variables."
+#: plugins/admin/fai/class_faiProfile.inc:223
+msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:71
-msgid "Create new FAI object - set of hooks."
+#: plugins/admin/fai/class_faiProfile.inc:227
+msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:72
-msgid "Create new FAI object - profile."
+#: plugins/admin/fai/class_faiProfile.inc:235
+msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:73
-msgid "Create new FAI object - template."
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:74
-msgid "Create new FAI object"
+#: plugins/admin/fai/headpage.tpl:6
+msgid "List of FAI classes"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:125
-msgid "The given class name is empty."
+#: plugins/admin/fai/headpage.tpl:24
+msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:129
-msgid "The specified class name is already in use for this object type."
+#: plugins/admin/fai/headpage.tpl:36
+msgid "Show profiles"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:133
-msgid "Please enter a valid class name. Only 0-9 a-z is allowed here."
+#: plugins/admin/fai/headpage.tpl:38
+msgid "Show scripts"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:5
-msgid ""
-"Please select a class name for this object. The class name specifies a set "
-"of configurations."
+#: plugins/admin/fai/headpage.tpl:39
+msgid "Show hooks"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:7
-msgid ""
-"Every Class name must be unique. But it can be used for different objects at "
-"the same time.\n"
-"\n"
-"\t   If you use this class name in a profile, all object with this class "
-"name will be included to this profile."
+#: plugins/admin/fai/headpage.tpl:40
+msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:11
-msgid ""
-"The list box below shows all available class names you may use, for this "
-"object, to avoid duplicates."
+#: plugins/admin/fai/headpage.tpl:41
+msgid "Show packages"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:17
-msgid "You can select of one the following class names for this object."
+#: plugins/admin/fai/headpage.tpl:42
+msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:21
-msgid "Available class names."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:177
+msgid "FS type"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:24
-msgid "Choose class name"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:178
+msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:36
-msgid "Please enter your class name here, if want to create a new class."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
+msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:40
-msgid "A new class name.</b>"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:31 plugins/admin/FAI/main.inc:38
-#: plugins/admin/FAI/main.inc:40
-msgid "FAI management"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+msgid "FS option"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:32
-msgid "Fully Automatic Installation - management"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:363
-msgid "New partition table"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:334
+#, php-format
+msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:363
-msgid "PT"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:339
+#, php-format
+msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:366
-msgid "New script bundle"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:344
+#, php-format
+msgid ""
+"File system type 'swap' is already used, change file system type for "
+"partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:366
-msgid "S"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:348
+msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:369
-msgid "New hook bundle"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:354
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:358
+#, php-format
+msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:369
-msgid "H"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:364
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#, php-format
+msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:372
-msgid "New variable bundle"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:371
+#, php-format
+msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:372
-msgid "V"
+#: plugins/admin/fai/faiScript.tpl:34
+msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:375
-msgid "New template bundle"
+#: plugins/admin/fai/faiScript.tpl:40
+msgid "Choose a script to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:375
-msgid "T"
+#: plugins/admin/fai/class_faiVariableEntry.inc:79
+msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:378
-msgid "New package bundle"
+#: plugins/admin/fai/faiVariableEntry.tpl:29
+msgid "Variable attributes"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:378
-msgid "PK"
+#: plugins/admin/fai/faiVariableEntry.tpl:34
+msgid "Variable content"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:383
-msgid "New profile bundle"
+#: plugins/admin/fai/faiTemplate.tpl:34
+msgid "List of template files"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:383
-msgid "P"
+#: plugins/admin/fai/faiTemplate.tpl:40
+msgid "Choose a template to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:396
-msgid "FAI objects / ObjectClasses"
+#: plugins/admin/fai/class_faiPartitionTable.inc:219
+#: plugins/admin/fai/class_faiPartitionTable.inc:225
+#, php-format
+msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:398
-msgid "Obtions"
+#: plugins/admin/fai/class_faiPartitionTable.inc:221
+#: plugins/admin/fai/class_faiPartitionTable.inc:227
+#, php-format
+msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:401
-msgid "Edit object"
+#: plugins/admin/fai/class_faiHookEntry.inc:97
+msgid "Please enter a value for script."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:402
-msgid "Delete object"
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
+msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:417
-#: plugins/admin/FAI/class_faiProfile.inc:152
-#: plugins/admin/FAI/class_faiProfileEntry.inc:118
-msgid "Partition table"
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+msgid "Hook attributes"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:424
-msgid "Package list"
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:431
-msgid "Script set"
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose a FAI task to hook"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:438
-msgid "Variable set"
+#: plugins/admin/fai/class_askClassName.inc:68
+msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:445
-msgid "Hook set"
+#: plugins/admin/fai/class_askClassName.inc:69
+msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:452
-msgid "Profile"
+#: plugins/admin/fai/class_askClassName.inc:70
+msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTable.inc:218
-#: plugins/admin/FAI/class_faiPartitionTable.inc:220
-msgid "Number of Partitions"
+#: plugins/admin/fai/class_askClassName.inc:71
+msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTable.inc:266
-msgid "Please enter a valid name."
+#: plugins/admin/fai/class_askClassName.inc:72
+msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:77
-msgid "Please specify a value for the attribute 'content'."
+#: plugins/admin/fai/class_askClassName.inc:73
+msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:81
-#: plugins/admin/FAI/class_faiHookEntry.inc:86
-#: plugins/admin/FAI/class_faiScriptEntry.inc:98
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:87
-msgid "Please enter a description."
+#: plugins/admin/fai/class_askClassName.inc:74
+msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:85
-#: plugins/admin/FAI/class_faiHookEntry.inc:90
-#: plugins/admin/FAI/class_faiScriptEntry.inc:102
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:91
-msgid "Invalid character in description. Please enter a valid description."
+#: plugins/admin/fai/class_askClassName.inc:75
+msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:89
-#: plugins/admin/FAI/class_faiHookEntry.inc:94
-#: plugins/admin/FAI/class_faiScriptEntry.inc:106
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:95
-msgid "Please enter a name."
+#: plugins/admin/fai/class_askClassName.inc:126
+msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:93
-#: plugins/admin/FAI/class_faiHookEntry.inc:98
-#: plugins/admin/FAI/class_faiScriptEntry.inc:110
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:99
-msgid "Please enter a valid name. Only a-Z 0-9 are allowed."
+#: plugins/admin/fai/class_askClassName.inc:130
+msgid "The specified class name is already in use for this object type."
 msgstr ""
 
-#: plugins/admin/FAI/faiVariableEntry.tpl:29
-msgid "Variable attributes"
+#: plugins/admin/fai/askClassName.tpl:6
+msgid ""
+"Adding a new class to the FAI management, requires a class name. You have to "
+"specify a unique class name for unique types of FAI classes, while you can "
+"use the same class name for different types of FAI classes. In the laste "
+"case, FAI will automatically enclose all these different class types to one "
+"unique class name."
 msgstr ""
 
-#: plugins/admin/FAI/faiVariableEntry.tpl:34
-msgid "Variable Content"
+#: plugins/admin/fai/askClassName.tpl:12
+msgid ""
+"Please use one of the following methods to choose the name for the new FAI "
+"class."
 msgstr ""
 
-#: plugins/admin/FAI/faiVariableEntry.tpl:49
-#: plugins/admin/FAI/faiHookEntry.tpl:59
-#: plugins/admin/FAI/faiScriptEntry.tpl:70
-#: plugins/admin/FAI/faiTemplateEntry.tpl:59
-msgid "Abort"
+#: plugins/admin/fai/askClassName.tpl:26
+msgid "Enter FAI class name manually"
 msgstr ""
 
-#: plugins/admin/FAI/faiTemplate.tpl:40
-msgid "Choose a template to delete or edit"
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
+msgid "Class name"
 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."
+#: plugins/admin/fai/askClassName.tpl:48
+msgid "Choose FAI class name from a list of existing classes"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiHookEntry.inc:77
-msgid "Please enter a value for task."
+#: plugins/admin/fai/askClassName.tpl:54
+msgid "Choose class name"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiHookEntry.inc:80
-msgid "Please enter a value for script."
+#: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+msgid "Use"
 msgstr ""
 
-#: plugins/admin/FAI/faiHookEntry.tpl:29
-msgid "Hook attributes"
+#: plugins/admin/fai/askClassName.tpl:74
+msgid "A new class name.</b>"
 msgstr ""
 
-#: plugins/admin/FAI/faiHookEntry.tpl:34
-#: plugins/admin/FAI/faiScriptEntry.tpl:50
-msgid "Script"
+#: plugins/admin/fai/class_faiTemplateEntry.inc:71
+msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/FAI/faiHookEntry.tpl:44
-msgid "Task"
+#: plugins/admin/fai/class_faiTemplateEntry.inc:73
+#, php-format
+msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:48
-msgid "Please select a valid file."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:153
+msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:51
-msgid "Selected file is empty."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:157
+msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:94
-msgid "Please specify a script."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:165
+msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/FAI/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
+msgid "Please enter a valid user. Only a-Z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:29
-#: plugins/admin/FAI/faiScriptEntry.tpl:48
-msgid "Script attributes"
+#: plugins/admin/fai/class_faiTemplateEntry.inc:172
+msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:38
-msgid "Choose a priority"
+#: plugins/admin/fai/class_faiTemplateEntry.inc:175
+msgid "Please enter a valid group. Only a-Z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:54
-msgid "Import script"
+#: plugins/admin/fai/faiTemplateEntry.tpl:21
+msgid "Template attributes"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:77
-msgid "Please specify a value for attribute 'file'."
+#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:122
+msgid "File"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:81
-msgid "Please specify a value for attribute 'path'."
+#: plugins/admin/fai/faiTemplateEntry.tpl:35
+msgid "Save template"
 msgstr ""
 
-#: plugins/admin/FAI/faiTemplateEntry.tpl:29
-msgid "Template attributes"
+#: plugins/admin/fai/faiTemplateEntry.tpl:47
+msgid "Destination path"
 msgstr ""
 
-#: plugins/admin/FAI/faiTemplateEntry.tpl:44 include/php_setup.inc:122
-msgid "File"
+#: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
+msgid "Owner"
 msgstr ""
 
-#: plugins/admin/FAI/faiHook.tpl:40
-msgid "Choose a hook to delete or edit"
+#: plugins/admin/fai/faiTemplateEntry.tpl:80
+msgid "Access"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:24
-msgid ""
-"This menu allows you to select FAI class names, to add them to the currently "
-"editted profile."
+#: plugins/admin/fai/faiTemplateEntry.tpl:86
+msgid "Class"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:37
-msgid "Show only classes with templates"
+#: plugins/admin/fai/faiTemplateEntry.tpl:87
+msgid "Read"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:39
-msgid "Show only classes with scripts"
+#: plugins/admin/fai/faiTemplateEntry.tpl:88
+msgid "Write"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:41
-msgid "Show only classes with hooks"
+#: plugins/admin/fai/faiTemplateEntry.tpl:91
+msgid "Special"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:43
-msgid "Show only classes with variables"
+#: plugins/admin/fai/faiTemplateEntry.tpl:100
+msgid "SUID"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:45
-msgid "Show only classes with packages"
+#: plugins/admin/fai/faiTemplateEntry.tpl:109
+msgid "SGID"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:47
-msgid "Show only classes with partitions"
+#: plugins/admin/fai/faiTemplateEntry.tpl:112
+msgid "Others"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:136
-#: plugins/admin/FAI/class_faiProfileEntry.inc:140
-msgid "This list displays all assigned class names for this profile."
+#: plugins/admin/fai/faiTemplateEntry.tpl:118
+msgid "sticky"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:144
-msgid "Append new class names"
+#: plugins/admin/fai/faiHook.tpl:34
+msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:147
-#: plugins/admin/FAI/class_faiProfileEntry.inc:113
-msgid "Hook bundle"
+#: plugins/admin/fai/faiHook.tpl:40
+msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:148
-#: plugins/admin/FAI/class_faiProfileEntry.inc:114
-msgid "Template bundle"
+#: plugins/admin/fai/class_faiPackageEntry.inc:43
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:149
-#: plugins/admin/FAI/class_faiProfileEntry.inc:115
-msgid "Script bundle"
+#: plugins/admin/fai/faiPackageEntry.tpl:6
+msgid "List of available packages"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:150
-#: plugins/admin/FAI/class_faiProfileEntry.inc:116
-msgid "Variable bundle"
+#: plugins/admin/fai/faiPackageEntry.tpl:27
+msgid ""
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:151
-msgid "Packages bundle"
+#: plugins/admin/fai/faiPackageNew.tpl:2
+msgid "Repository settings"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:154
-msgid "Remove class from profile"
+#: plugins/admin/fai/faiPackageNew.tpl:6
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:209
-msgid "Please specify a description for this profile."
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:217
-msgid "Please enter a valid name. Only 0-9 a-Z are allowed here."
+#: plugins/admin/fai/faiPackageNew.tpl:11
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:221
-msgid "Please assign at least one class to this  profile."
+#: plugins/admin/fai/faiPackageNew.tpl:17
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:229
-msgid "There is already a profile with this class name defined."
+#: plugins/admin/fai/faiPackageNew.tpl:25
+msgid "Following releases are available"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfile.tpl:31
-msgid "List of used class names"
+#: plugins/admin/fai/faiPackageNew.tpl:37
+msgid "Sections for this release"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfileEntry.inc:117
-msgid "Package bundle"
+#: plugins/admin/fai/faiPackageNew.tpl:48
+msgid "Matching mirrors"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/main.inc:121
 msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:115
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:132
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:520
-msgid "Error while performing query "
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:547
+msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:534
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:724
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:551
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:734
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:663
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:735
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:666
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:669
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:738
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:667
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:670
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:742
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:683
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:713
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:785
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:799
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:871
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
 msgid ""
-"The specified oicemail PIN contains invalid characters, only numeric values "
+"The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:880
 msgid "Phone PIN must be 4 characters long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:811
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
 msgid ""
 "The specified phone PIN contains invalid characters, only numeric values are "
 "allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:821
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:893
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:828
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:990
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1062
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1025
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1097
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
@@ -7417,10 +7926,6 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:68
-msgid "Complete"
-msgstr ""
-
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr ""
@@ -7457,61 +7962,61 @@ msgstr ""
 msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: 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:147
+#: 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:232
+#: 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:250
+#: 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:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
+#: 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:281
+#: 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:323
+#: plugins/gofon/macro/class_gofonMacro.inc:336
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:328
+#: 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:332
+#: 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:337
+#: 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:343
+#: plugins/gofon/macro/class_gofonMacro.inc:356
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
+#: plugins/gofon/macro/class_gofonMacro.inc:361
 msgid "Please choose a valid  base."
 msgstr ""
 
@@ -7654,11 +8159,11 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:62
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:70
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:150
 msgid "Phone number"
 msgstr ""
 
@@ -7667,7 +8172,7 @@ msgid "Preset PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:314
 msgid "PIN"
 msgstr ""
 
@@ -7703,27 +8208,23 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:308
 msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
 msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-msgid "Owner"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:368
 msgid "Conference"
 msgstr ""
 
@@ -7738,29 +8239,29 @@ msgid ""
 "selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:35
+#: plugins/gofon/conference/headpage.tpl:36
 msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:188
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:192
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:200
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:204
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
@@ -7810,7 +8311,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:313
+#: include/php_setup.inc:71 html/main.php:315
 msgid "Toggle information"
 msgstr ""
 
@@ -7913,10 +8414,6 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:587
-msgid "Configure"
-msgstr ""
-
 #: include/functions.inc:592
 msgid "incomplete"
 msgstr ""
@@ -8041,7 +8538,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:195 html/index.php:140
+#: include/class_config.inc:195 html/index.php:136
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
@@ -8081,26 +8578,26 @@ msgstr ""
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/class_ldap.inc:438
+#: include/class_ldap.inc:437
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:671
+#: 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:684
+#: 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:700
+#: include/class_ldap.inc:728
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -8129,12 +8626,12 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/functions_helpviewer.inc:292
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: include/functions_helpviewer.inc:367
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
@@ -8223,302 +8720,326 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr ""
 
+#: include/functions_setup.inc:231
+msgid "Support for nagios disabled, no schema seems to be installed"
+msgstr ""
+
 #: include/functions_setup.inc:236
+msgid "Support for nagios enabled"
+msgstr ""
+
+#: include/functions_setup.inc:246
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:243
+#: include/functions_setup.inc:253
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:271
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:264
+#: include/functions_setup.inc:274
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:266
+#: include/functions_setup.inc:276
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:283
+#: include/functions_setup.inc:293
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:295
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:288
+#: include/functions_setup.inc:298
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:299
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:292
+#: include/functions_setup.inc:302
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:296
+#: include/functions_setup.inc:306
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:307
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:310
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:311
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:314
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:315
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:318
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:319
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:311
+#: include/functions_setup.inc:322
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:323
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:315
+#: include/functions_setup.inc:326
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:327
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:330
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:331
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:334
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:335
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:327
+#: include/functions_setup.inc:338
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:339
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:342
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:343
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:342
+#: include/functions_setup.inc:379
+msgid "PHP detailed function inspection"
+msgstr ""
+
+#: include/functions_setup.inc:383
+#, php-format
+msgid "Checking for function <b>%s</b>"
+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."
+msgstr ""
+
+#: include/functions_setup.inc:395
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:404
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:405
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:355
+#: include/functions_setup.inc:408
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:356
+#: include/functions_setup.inc:409
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:363
+#: include/functions_setup.inc:416
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:364
+#: include/functions_setup.inc:417
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:379
+#: include/functions_setup.inc:432
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:380
+#: include/functions_setup.inc:433
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:446
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:447
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:397
+#: include/functions_setup.inc:450
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:398
+#: include/functions_setup.inc:451
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:458
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:406
+#: include/functions_setup.inc:459
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:413
+#: include/functions_setup.inc:466
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:467
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:471
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:472
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:423
+#: include/functions_setup.inc:476
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:424
+#: include/functions_setup.inc:477
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:666
+#: include/functions_setup.inc:720
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:675 include/functions_setup.inc:758
+#: include/functions_setup.inc:729 include/functions_setup.inc:812
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:689 include/functions_setup.inc:763
-#: include/functions_setup.inc:768
+#: include/functions_setup.inc:743 include/functions_setup.inc:817
+#: include/functions_setup.inc:822
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:778
+#: include/functions_setup.inc:832
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:888
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:865
+#: include/functions_setup.inc:919
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:874
+#: include/functions_setup.inc:928
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
+#: include/functions_setup.inc:1038 include/functions_setup.inc:1061
+#: include/functions_setup.inc:1070 html/index.php:172
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -8526,34 +9047,179 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/class_ppdManager.inc:57
+#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
 #, php-format
 msgid ""
-"Parsing PPD file %s faild - line too long. Trailing characters have been "
+"Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:78
+#: include/class_ppdManager.inc:132
+msgid "Nested groups are not supported!"
+msgstr ""
+
+#: include/class_ppdManager.inc:136
+msgid "Group name not unique!"
+msgstr ""
+
+#: include/class_ppdManager.inc:142 include/class_ppdManager.inc:172
+msgid "Symbol values are not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:166
+msgid "Nested options are not supported!"
+msgstr ""
+
+#: include/class_ppdManager.inc:191
+msgid "PickMany is not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:263
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: html/helpviewer.php:54
+#: html/helpviewer.php:58
 msgid "Help is not available if you are not logged in."
 msgstr ""
 
-#: html/helpviewer.php:85
+#: html/helpviewer.php:89
 msgid "previous"
 msgstr ""
 
-#: html/helpviewer.php:89
+#: html/helpviewer.php:93
 msgid "next"
 msgstr ""
 
-#: html/helpviewer.php:141
+#: html/helpviewer.php:154
 #, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
+#: html/helpviewer.php:162 ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: html/getxls.php:54
+msgid "Birthday"
+msgstr ""
+
+#: html/getxls.php:54
+msgid "Sexe"
+msgstr ""
+
+#: html/getxls.php:54 html/getxls.php:150 html/getxls.php:195
+#: html/getxls.php:207
+msgid "Firstname"
+msgstr ""
+
+#: html/getxls.php:79 html/getxls.php:198
+msgid "Members"
+msgstr ""
+
+#: html/getxls.php:104 html/getxls.php:215
+msgid "Computers"
+msgstr ""
+
+#: html/getxls.php:114 html/getxls.php:162 html/getxls.php:288
+#: html/getxls.php:305
+msgid "Common Name"
+msgstr ""
+
+#: html/getxls.php:126
+msgid "Server Name"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Common name"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Display Name"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Home postal address"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Mail address"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Mobile phone"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Postal address"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Adress"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Surename"
+msgstr ""
+
+#: html/getxls.php:150
+msgid "Function"
+msgstr ""
+
+#: html/getxls.php:152 html/getxls.php:216
+msgid "Adressbook"
+msgstr ""
+
+#: html/getxls.php:195
+msgid "BirthDate"
+msgstr ""
+
+#: html/getxls.php:201
+msgid "Uid"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "DisplayName"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Phone Number"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Postal Adress"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Email address"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "mobile"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Organizational Unit"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Postal Address"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Postal Code"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Sn"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "st"
+msgstr ""
+
+#: html/getxls.php:207
+msgid "Title"
 msgstr ""
 
 #: html/getfax.php:53
@@ -8575,68 +9241,68 @@ msgstr ""
 #: html/setup.php:86
 #, php-format
 msgid ""
-"Directory '%s' specified as smarty compile directory is not accessable, "
-"check existence and rigths of this directory!"
+"Directory '%s' specified as smarty compile directory is not accessible, "
+"please check existence and rights of this directory!"
 msgstr ""
 
-#: html/main.php:112
+#: html/main.php:114
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:155
+#: html/main.php:157
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:284
+#: html/main.php:286
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:315
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 
-#: html/index.php:53
+#: html/index.php:49
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:75
+#: html/index.php:71
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 
-#: html/index.php:148
+#: html/index.php:144
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:156
+#: html/index.php:152
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:184
+#: html/index.php:180
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:186
+#: html/index.php:182
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:193
+#: html/index.php:189
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:231
+#: html/index.php:227
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:231
+#: html/index.php:227
 msgid "Enter SSL session"
 msgstr ""
 
@@ -8964,8 +9630,16 @@ msgstr ""
 msgid "GOsa help viewer"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
 msgstr ""
 
 #: ihtml/themes/default/setup_step4.tpl:100