Code

Fixed remove.tpl
[gosa.git] / locale / messages.po
index 6fdc235c0b95b388286bbf98f108c14ed5824a72..48cf1bb90208d7d3622a14e2ac14f55aec0d0b06 100644 (file)
@@ -2,53 +2,52 @@
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:26
+#: contrib/gosa.conf:28
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:49
+#: contrib/gosa.conf:51
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:64 contrib/gosa.conf:76 contrib/gosa.conf:85
-#: contrib/gosa.conf:91 contrib/gosa.conf:96 contrib/gosa.conf:102
-#: contrib/gosa.conf:111 contrib/gosa.conf:120 contrib/gosa.conf:129
-#: contrib/gosa.conf:134 contrib/gosa.conf:139 contrib/gosa.conf:144
-#: contrib/gosa.conf:149 contrib/gosa.conf:154
+#: contrib/gosa.conf: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/faiVariable.tpl:4
-#: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:1
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
-#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/fai/faiHookEntry.tpl:5
-#: plugins/admin/fai/faiTemplateEntry.tpl:3
+#: 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:65
+#: contrib/gosa.conf:67
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:66 contrib/gosa.conf:77
+#: 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:67 contrib/gosa.conf:79
+#: 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/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
@@ -56,29 +55,30 @@ msgstr ""
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:68 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:69 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:70 plugins/personal/generic/generic.tpl:241
+#: 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:71 plugins/personal/generic/generic.tpl:224
+#: 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
@@ -86,7 +86,7 @@ msgstr ""
 #: 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:706
 #: plugins/admin/systems/chooser.tpl:12
@@ -97,44 +97,50 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:72 contrib/gosa.conf:81 contrib/gosa.conf:87
-#: contrib/gosa.conf:92 contrib/gosa.conf:98 contrib/gosa.conf:107
-#: contrib/gosa.conf:116 contrib/gosa.conf:125 contrib/gosa.conf:130
-#: contrib/gosa.conf:135 contrib/gosa.conf:140 contrib/gosa.conf:145
-#: contrib/gosa.conf:150 contrib/gosa.conf:155
+#: contrib/gosa.conf: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:78
+#: 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:80
+#: contrib/gosa.conf:83
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:86 plugins/admin/applications/generic.tpl:58
+#: 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:97 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
+#: contrib/gosa.conf:100 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:103 contrib/gosa.conf:121
+#: contrib/gosa.conf:106 contrib/gosa.conf:124
 #: plugins/admin/ogroups/tabs_ogroups.inc:93
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:104 contrib/gosa.conf:122
+#: contrib/gosa.conf:107 contrib/gosa.conf:125
+#: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:105 contrib/gosa.conf:123
+#: 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
@@ -143,198 +149,317 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:106 contrib/gosa.conf:115 contrib/gosa.conf:124
+#: 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/headpage.tpl:20
 #: 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/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:112
+#: contrib/gosa.conf:115
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:113 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:116 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:167 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:168 plugins/personal/mail/generic.tpl:112
+#: 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/addons/ldapmanager/contentimport.tpl:49
 #: plugins/admin/applications/generic.tpl:83
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:173
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:177
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:177 plugins/personal/environment/logonManagement.tpl:55
+#: 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:181 plugins/admin/fai/class_faiManagement.inc:542
+#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:542
 #: plugins/admin/fai/class_faiManagement.inc:543
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:535
+#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:535
 #: plugins/admin/fai/class_faiManagement.inc:536
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:556
+#: contrib/gosa.conf:193 plugins/admin/fai/class_faiManagement.inc:556
 #: plugins/admin/fai/class_faiManagement.inc:557
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:193 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:197 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:197
+#: contrib/gosa.conf:201
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:213
+#: contrib/gosa.conf:217
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:230 plugins/admin/ogroups/class_phonequeue.inc:161
+#: contrib/gosa.conf:234 plugins/admin/ogroups/class_phonequeue.inc:161
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:231
+#: contrib/gosa.conf:235
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:232
+#: contrib/gosa.conf:236
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:233
+#: contrib/gosa.conf:237
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:234
+#: contrib/gosa.conf:238
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:235
+#: contrib/gosa.conf:239
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:240
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: 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
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: 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
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:34
-#: plugins/personal/environment/selectPrinterDialog.tpl:35
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: 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/ogroups/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/fai/headpage.tpl:29 plugins/admin/fai/faiProfileEntry.tpl:29
-#: plugins/admin/fai/faiPackageEntry.tpl:34
-#: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:28
-msgid "Filters"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: 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
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/admin/ogroups/mail.tpl:10
+msgid "Primary address"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:13
+msgid "Specify the mail server where the user will be hosted on"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
+#: plugins/admin/systems/class_printGeneric.inc:353
+msgid "not defined"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+msgid "Alternative addresses"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
+msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/samba/samba3.tpl:307
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/environment/environment.tpl:117
 #: plugins/personal/environment/environment.tpl:134
 #: plugins/personal/environment/environment.tpl:177
@@ -347,131 +472,30 @@ msgstr ""
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/generic.tpl:99
 #: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/phonesettings.tpl:181
 #: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:70
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:73
 #: plugins/admin/systems/workstationStartup.tpl:92
 #: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:95
-#: plugins/admin/ogroups/generic.tpl:38
+#: 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/faiVariable.tpl:43
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/fai/class_faiProfile.inc:144
-#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:43
-#: plugins/admin/fai/faiHook.tpl:43 plugins/gofon/phoneaccount/generic.tpl:13
+#: 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 ""
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:106
-#: 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
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
-#: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:617
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:92
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
-#: 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:383
-#: plugins/admin/fai/class_faiManagement.inc:388
-#: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:133
-#: plugins/admin/fai/faiPackageNew.tpl:66
-#: plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16
-#: 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/generic.tpl:7 plugins/admin/groups/mail.tpl:10
-#: plugins/admin/ogroups/mail.tpl:10
-msgid "Primary address"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:13
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:147
-msgid "not defined"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
-msgid "Alternative addresses"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
-msgid "List of alternative mail addresses"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
@@ -491,19 +515,17 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/printer.tpl:85 plugins/admin/systems/printer.tpl:102
+#: plugins/admin/systems/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/systems/terminalStartup.tpl:76
-#: plugins/admin/systems/terminalStartup.tpl:96
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/remove.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
@@ -592,15 +614,16 @@ msgid "disables all Mail options!"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/samba/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/connectivity/main.inc:116
+#: plugins/personal/generic/main.inc:158
+#: 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:536
@@ -612,9 +635,70 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: 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:117
+#: plugins/personal/environment/main.inc:106
+#: 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
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:538
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/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/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: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:179
-#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/connectivity/main.inc:125
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:111
@@ -623,18 +707,19 @@ msgstr ""
 
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
 #: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/connectivity/main.inc:126
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/nagios/main.inc:115
 #: plugins/gofax/faxaccount/generic.tpl:90
 #: plugins/gofax/faxaccount/generic.tpl:96
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:61 plugins/admin/fai/faiVariable.tpl:44
+#: plugins/admin/systems/printer.tpl:46
 #: plugins/admin/fai/faiPartitionTable.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
+#: 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 ""
 
@@ -642,150 +727,92 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: 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
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-msgid "This does something"
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:34
+#: plugins/personal/environment/selectPrinterDialog.tpl:35
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:32
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/fai/faiProfileEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/faiPackageEntry.tpl:34
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+msgid "Filters"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:45
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
+#: plugins/personal/password/class_password.inc:5
+#: 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
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
+msgid "Password"
 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 ""
 
@@ -837,34 +864,23 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
-#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
+#: include/functions.inc:1285 ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:5
-#: 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
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
-msgid "Password"
-msgstr ""
-
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -903,55 +919,17 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:85
-#: plugins/personal/samba/class_sambaAccount.inc:630
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
-#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:92
-msgid "Trust mode"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:6
@@ -1013,23 +991,22 @@ msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/groups/headpage.tpl:66
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:74 plugins/admin/groups/headpage.tpl:75
+#: plugins/admin/groups/headpage.tpl:73
 msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/admin/groups/headpage.tpl:76
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1042,17 +1019,55 @@ msgstr ""
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:85
+#: plugins/personal/samba/class_sambaAccount.inc:630
+msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
+#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/main.inc:131
@@ -1592,26 +1607,6 @@ msgstr ""
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:252
-msgid "fr_FR"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "en_EN"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "de_DE"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "it_IT"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:252
-msgid "nl_NL"
-msgstr ""
-
 #: plugins/personal/generic/class_user.inc:262
 msgid "This account has no valid GOsa extensions."
 msgstr ""
@@ -1668,7 +1663,7 @@ msgstr ""
 
 #: 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 ""
 
@@ -1678,7 +1673,7 @@ msgstr ""
 
 #: 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 ""
 
@@ -1745,6 +1740,13 @@ msgstr ""
 msgid "Could not open specified certificate!"
 msgstr ""
 
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
@@ -1761,21 +1763,18 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
 #: 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/faiVariable.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:6
 #: 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/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/gofon/macro/parameter.tpl:5
+#: 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 ""
 
@@ -1810,7 +1809,7 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:195
 msgid "Sex"
 msgstr ""
 
@@ -1822,9 +1821,9 @@ msgstr ""
 #: 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/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/printer.tpl:29
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
@@ -1878,7 +1877,7 @@ msgstr ""
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:183 html/getxls.php:207
 msgid "Organization"
 msgstr ""
 
@@ -1887,7 +1886,7 @@ msgstr ""
 #: 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:586
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -1923,20 +1922,20 @@ msgstr ""
 
 #: 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:257
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/workstation.tpl:18
-#: plugins/admin/systems/printer.tpl:49
+#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:150
 msgid "Location"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:261
-#: plugins/admin/departments/generic.tpl:46
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:150
 msgid "State"
 msgstr ""
 
@@ -1974,7 +1973,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:339
 #: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:150
 msgid "Postal code"
 msgstr ""
 
@@ -1994,13 +1993,6 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-
 #: plugins/personal/generic/generic_picture.tpl:23
 msgid "Remove picture"
 msgstr ""
@@ -2009,24 +2001,10 @@ msgstr ""
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/addons/addressbook/address_edit.tpl:114
 #: plugins/admin/systems/servnfs.tpl:91
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/fai/faiScriptEntry.tpl:67
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
-msgstr ""
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -2039,9 +2017,11 @@ msgstr ""
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/admin/systems/workstationStartup.tpl:93
+#: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/fai/faiPackage.tpl:74
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:246
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:245
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -2058,54 +2038,41 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-#: plugins/personal/environment/environment.tpl:65
-msgid "Quota"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr ""
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr ""
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr ""
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:16
@@ -2128,8 +2095,65 @@ msgstr ""
 msgid "per"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+msgid ""
+"You're trying to add an invalid email address to the list of delegations."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
+msgid ""
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
 msgstr ""
 
 #: plugins/personal/connectivity/phpgw.tpl:1
@@ -2180,94 +2204,89 @@ msgstr ""
 msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
 msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:65
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
@@ -2302,37 +2321,6 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr ""
-
 #: plugins/personal/connectivity/intranet.tpl:1
 msgid "Intranet account"
 msgstr ""
@@ -2382,50 +2370,116 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:3
-msgid "The environment extension is currently disabled."
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:100
-#: plugins/personal/environment/environment.tpl:146
-msgid "Environment managment settings"
+#: plugins/personal/environment/class_environment.inc:214
+#: plugins/personal/environment/class_environment.inc:250
+msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:11
-msgid "Profile managment"
+#: 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/environment.tpl:18
-msgid "Use profile managment"
+#: 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/environment.tpl:25
-msgid "Profile server managment"
+#: 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/environment.tpl:28
-msgid "Profil path"
+#: plugins/personal/environment/class_environment.inc:230
+#: plugins/personal/environment/class_environment.inc:263
+msgid ""
+"Environment extension disabled. You have to setup a posix account before you "
+"can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:42
-msgid "Cache profile localy"
+#: 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/environment.tpl:51
-msgid "Kiosk profile settings"
+#: plugins/personal/environment/class_environment.inc:679
+msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:54
-msgid "Kiosk profile"
+#: 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/environment.tpl:60
-msgid "Manage"
+#: plugins/personal/environment/class_environment.inc:708
+msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:79
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/class_environment.inc:801
+msgid "Error while writing printer"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:871
+msgid "Error while writing printer settings"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:986
+msgid "Admin"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:3
+msgid "The environment extension is currently disabled."
+msgstr ""
+
+#: 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:11
+msgid "Profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:18
+msgid "Use profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:25
+msgid "Profile server managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:28
+msgid "Profil path"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:42
+msgid "Cache profile localy"
+msgstr ""
+
+#: 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:79
+msgid "Resolution changeable on runtime"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:84
@@ -2436,11 +2490,13 @@ msgstr ""
 
 #: 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:116
 #: plugins/admin/systems/workstationStartup.tpl:91
+#: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr ""
 
@@ -2480,10 +2536,6 @@ msgstr ""
 msgid "Admin Toggle"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr ""
-
 #: plugins/personal/environment/class_hotplugDialog.inc:109
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
@@ -2504,11 +2556,6 @@ msgstr ""
 msgid "Please select an entry or press cancel."
 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/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr ""
@@ -2534,7 +2581,7 @@ msgstr ""
 #: plugins/personal/environment/hotplugDialog.tpl:53
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/users/headpage.tpl:48
-#: plugins/gofon/conference/headpage.tpl:34
+#: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr ""
 
@@ -2542,64 +2589,9 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: 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: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: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: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:230
-#: plugins/personal/environment/class_environment.inc:263
-msgid ""
-"Environment extension disabled. You have to setup a posix account before you "
-"can enable this feature."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:449
-#: plugins/admin/systems/class_workstationStartup.inc:272
-msgid "You must specify a valid mount point."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:677
-msgid "Please set a valid profile quota size."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:684
-msgid ""
-"You need to setup a valid posix extension in order to enable evironment "
-"features."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:706
-msgid "Can't save new kiosk profiles, possibly permission denied for folder"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:799
-msgid "Error while writing printer"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:869
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:984
-msgid "Admin"
+#: 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
@@ -2608,7 +2600,7 @@ 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 ""
 
@@ -2627,14 +2619,6 @@ msgstr ""
 msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:93
-msgid "Specified name is invalid."
-msgstr ""
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
-msgid "Specified description contains invalid characters."
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr ""
@@ -2649,21 +2633,21 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:24
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:18
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/ogroups/generic.tpl:13
+#: 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:16
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.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/faiHook.tpl:19
-#: plugins/admin/fai/faiHookEntry.tpl:17
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: 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 ""
 
@@ -2688,24 +2672,12 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:57
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:81
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+#: plugins/personal/environment/class_logonManagementDialog.inc:93
+msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:87
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
+msgid "Specified description contains invalid characters."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
@@ -2729,23 +2701,83 @@ msgstr ""
 msgid "save"
 msgstr ""
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: 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 "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:12
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
 #: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
 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 ""
@@ -2794,123 +2826,43 @@ msgstr ""
 msgid "authorized_for_system_information"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:18
-msgid "Nagios"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:82
-msgid "This account has no nagios extensions."
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:91
-msgid "Remove nagios account"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:176
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
+msgid "Type"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
-msgid "Create nagios account"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:169
-msgid "The required field 'NagiosAlias' is not set."
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 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/main.inc:124
-msgid "User nagios settings"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/servnfs.tpl:31
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: 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 ""
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
@@ -2932,7 +2884,7 @@ 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:562
@@ -2945,11 +2897,10 @@ 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:562
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:417
@@ -2960,7 +2911,7 @@ 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:563
@@ -2973,7 +2924,7 @@ 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:563
@@ -2986,7 +2937,7 @@ 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:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2997,7 +2948,7 @@ 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:564
@@ -3018,7 +2969,7 @@ 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:573
@@ -3031,7 +2982,7 @@ 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:574
@@ -3044,7 +2995,7 @@ 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:574
@@ -3057,7 +3008,7 @@ 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:579
@@ -3069,14 +3020,14 @@ 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:580
@@ -3089,7 +3040,7 @@ 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 ""
@@ -3101,7 +3052,7 @@ 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:587
@@ -3172,6 +3123,41 @@ msgid ""
 "abort."
 msgstr ""
 
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr ""
+
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -3181,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 ""
 
@@ -3276,8 +3263,15 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
+#: plugins/admin/groups/application_options.tpl:8
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1276
+#: 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 ""
 
@@ -3342,6 +3336,57 @@ msgid ""
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:560
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
+msgid "User"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+msgid "# pages"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -3376,13 +3421,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
-#: plugins/admin/systems/class_printGeneric.inc:542
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
-msgid "User"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -3397,60 +3435,12 @@ msgstr ""
 msgid "Receiver"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
-msgid "# pages"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr ""
-
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr ""
-
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr ""
@@ -3480,6 +3470,10 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr ""
+
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3553,13 +3547,6 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr ""
@@ -3570,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 ""
 
@@ -3590,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 ""
 
@@ -3599,6 +3588,13 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr ""
@@ -3669,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 ""
 
@@ -3687,46 +3685,9 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr ""
-
-#: plugins/addons/ldapmanager/main.inc:23
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-msgid "LDAP manager"
-msgstr ""
-
-#: plugins/addons/ldapmanager/class_csvimport.inc:6
-#: plugins/addons/ldapmanager/class_import.inc:6
-msgid "LDIF export"
+#: plugins/addons/ldapmanager/class_csvimport.inc:6
+#: plugins/addons/ldapmanager/class_import.inc:6
+msgid "LDIF export"
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:93
@@ -3799,6 +3760,38 @@ msgstr ""
 msgid "Import successful"
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr ""
@@ -3815,6 +3808,7 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:10
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
 msgid "Export single entry"
 msgstr ""
 
@@ -3824,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 ""
 
@@ -3843,6 +3841,11 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+#: plugins/addons/ldapmanager/main.inc:23
+msgid "LDAP manager"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr ""
@@ -3852,43 +3855,39 @@ 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/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
+#: 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/logview/contents.tpl:48
-msgid "Enter string to search for"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+msgid "Choose the data you want to Export"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+msgid "Export complete XLS for"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the complete LDAP database to a xls file"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the LDAP Export to a xls file"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
+msgid "XLS export"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
+#: plugins/addons/ldapmanager/class_exportxls.inc:35
+msgid "You've no permission to do XLS exports."
 msgstr ""
 
 #: plugins/addons/logview/class_logview.inc:6
@@ -3946,15 +3945,85 @@ msgstr ""
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr ""
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:115
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:161
+msgid "This 'dn' is no group."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Samba group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Domain admins"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Domain users"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:267
+msgid "Domain guests"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:272
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: 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:616
 msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:627
+#: plugins/admin/groups/class_groupGeneric.inc:634
+msgid "Value specified as 'Name' is already used."
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11
@@ -3981,10 +4050,15 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
 #: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
@@ -3992,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 ""
 
@@ -4028,7 +4103,7 @@ 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 ""
 
@@ -4045,7 +4120,7 @@ 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
@@ -4061,73 +4136,14 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:115
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:161
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-msgid "Samba group"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-msgid "Domain admins"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-msgid "Domain users"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:267
-msgid "Domain guests"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:272
-#, php-format
-msgid "Special group (%d)"
-msgstr ""
-
-#: 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:616
+#: plugins/admin/groups/remove.tpl:7
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:627
-#: plugins/admin/groups/class_groupGeneric.inc:634
-msgid "Value specified as 'Name' is already used."
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr ""
-
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:153
@@ -4175,8 +4191,49 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:55
+msgid "This 'dn' is no acl container."
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:200
+msgid "All fields are writeable"
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
@@ -4227,29 +4284,8 @@ msgstr ""
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr ""
-
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:61
@@ -4289,81 +4325,50 @@ msgstr ""
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/password.tpl:2
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:37
-msgid "Show templates"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1010
+#: plugins/admin/systems/class_systemManagement.inc:703
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: 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
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
-msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+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 ""
 
@@ -4382,37 +4387,37 @@ msgstr ""
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:474
+#: 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
@@ -4421,110 +4426,122 @@ 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 ""
 
-#: plugins/admin/users/class_userManagement.inc:996
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:703
-msgid "Template"
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
 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_step3.tpl:18
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:37
+msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -4534,7 +4551,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
+#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
 #: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
@@ -4587,14 +4604,11 @@ msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Upload"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:85
-msgid "Create template"
-msgstr ""
-
 #: plugins/admin/applications/class_applicationParameters.inc:47
 msgid "Remove options"
 msgstr ""
@@ -4636,37 +4650,28 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:103
-msgid "This 'dn' is no application."
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:219
-msgid "The specified picture has not been uploaded correctly."
+#: plugins/admin/applications/headpage.tpl:38
+msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:300
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:305
-msgid "Required field 'Name' is not filled."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:309
-msgid "Invalid character in application name. Only a-z 0-9 are allowed."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:313
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Regular expression for matching application names"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:322
-msgid "There's already an application with this 'Name'."
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
 msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:247
@@ -4688,23 +4693,44 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
+#: plugins/admin/applications/class_applicationGeneric.inc:82
+msgid "no example"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/applications/class_applicationGeneric.inc:97
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:213
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
+#: 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:299
+msgid "Required field 'Name' is not filled."
+msgstr ""
+
+#: 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:307
+msgid "Required field 'Execute' is not filled."
+msgstr ""
+
+#: 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/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 ""
 
 #: plugins/admin/departments/generic.tpl:8
@@ -4753,14 +4779,6 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/tabs_department.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/tabsProfile.inc:30 plugins/admin/fai/tabsScript.inc:30
-#: plugins/admin/fai/tabsTemplate.inc:30
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:7
 #: plugins/gofon/conference/remove.tpl:7
 msgid ""
@@ -4777,29 +4795,27 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-msgid "You have no permissions to create a department on this 'Base'."
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:147
-#: plugins/admin/departments/class_departmentGeneric.inc:149
-msgid "Department with that 'Name' already exists."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:157
-msgid "Required field 'Description' is not set."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:163
-msgid " Please choose another name."
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
@@ -4845,16 +4861,25 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/admin/departments/class_departmentGeneric.inc:149
+msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/departments/class_departmentGeneric.inc:157
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:163
+msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -4864,10 +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_workstationStartup.inc:207
 #: plugins/admin/systems/class_workstationService.inc:121
+#: plugins/admin/systems/class_workstationStartup.inc:212
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -4895,36 +4920,46 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/class_servService.inc:259
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:257
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:438
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -5025,108 +5060,40 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-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_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:211
-#: plugins/admin/systems/class_printGeneric.inc:424
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/printer.tpl:31
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr ""
-
-#: plugins/admin/systems/terminal.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:47
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-msgid "Swap server"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Syslog server"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:56
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:62
-msgid "NTP server"
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:64
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
-#: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:82
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:83
@@ -5178,80 +5145,118 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:157
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:168
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:42
-msgid "Select action to execute for this server"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:259
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/class_servDB.inc:152
+#, php-format
+msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/class_servDB.inc:176
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
+#: 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/printer.tpl:14
-msgid "Printer name"
+#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:46
-msgid "Details"
+#: plugins/admin/systems/server.tpl:42
+msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:53
-msgid "Printer URL"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:61
-msgid "PPD"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:71
-msgid "Permissions"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:79
-msgid "Following objects are assigned as user."
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:45
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:83
-msgid "Add user"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:47
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:84
-msgid "Add group"
+#: plugins/admin/systems/terminal.tpl:52
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:96
-msgid "Following objects are assigned as admin."
+#: plugins/admin/systems/terminal.tpl:54
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:97
-msgid "Admins"
+#: plugins/admin/systems/terminal.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.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:62
+msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:100
-msgid "Add admin user"
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:64
+msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:101
-msgid "Add admin group"
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:82
+msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -5315,11 +5320,11 @@ msgstr ""
 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 ""
 
@@ -5355,6 +5360,56 @@ msgid ""
 "below."
 msgstr ""
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:30
+msgid "Details"
+msgstr ""
+
+#: 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:45
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:57
+msgid "Permissions"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:64
+msgid "Users which are allowed to use this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
+msgid "Add user"
+msgstr ""
+
+#: 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:68
 msgid "Activated"
 msgstr ""
@@ -5554,80 +5609,73 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: 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/servkolab.tpl:81
-msgid "Quota settings"
+#: 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/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_printGeneric.inc:199
+#: plugins/admin/systems/class_printGeneric.inc:202
+msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: 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/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: 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/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: 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/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: 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/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_printGeneric.inc:222
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: 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/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: 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/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_printGeneric.inc:428
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: 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 ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -5648,6 +5696,14 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr ""
+
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -5708,257 +5764,232 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:157
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:168
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servKolab.inc:143
 #, php-format
-msgid "The specified kerberos password is empty."
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servKolab.inc:149
 #, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59 plugins/admin/systems/headpage.tpl:60
-msgid "Display systems of user"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:63
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Add Kolab service"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:143
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:149
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/remove.tpl:7
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-#: plugins/admin/systems/class_printGeneric.inc:206
-#: plugins/admin/systems/class_printGeneric.inc:209
-msgid "Add printer extension"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:186
-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"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:198
-#: plugins/admin/systems/class_printGeneric.inc:201
-msgid "Remove printer extension"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:199
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:202
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:207
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:210
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:221
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:339
-msgid "Undefined"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:350
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:352
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:414
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:537
-#: plugins/admin/systems/class_printGeneric.inc:539
-#: 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"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
 #: plugins/admin/systems/password.tpl:2
@@ -6025,22 +6056,6 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:41
-msgid "Charset"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:63
-msgid "Path"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:75
-msgid "Option"
-msgstr ""
-
 #: plugins/admin/systems/class_phoneGeneric.inc:102
 msgid "This 'dn' has no phone features."
 msgstr ""
@@ -6086,40 +6101,6 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:101
-msgid "Please specify a valid path for your setup."
-msgstr ""
-
-#: plugins/admin/systems/class_servNfs.inc:107
-msgid "Please specify a valid name for your setup."
-msgstr ""
-
-#: plugins/admin/systems/class_servNfs.inc:110
-msgid "Please specify a name for your setup."
-msgstr ""
-
-#: plugins/admin/systems/class_servNfs.inc:115
-msgid "Description contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servNfs.inc:119
-msgid "Path contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servNfs.inc:123
-msgid "Option contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationStartup.inc:192
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationStartup.inc:243
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configuratons."
-msgstr ""
-
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Specific Phone settings"
 msgstr ""
@@ -6196,83 +6177,16 @@ msgstr ""
 msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
-msgid "Select entry"
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
-msgid "Select user/group to add"
-msgstr ""
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
-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."
-msgstr ""
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
-msgid "Display members of department"
-msgstr ""
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
-msgid "Display members matching"
-msgstr ""
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
-msgid "Regular expression for matching member names"
-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: "
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:13
-msgid "Select"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-msgid "List of PPDs"
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
-msgid "Reset list"
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:87
-msgid "Upload PPD"
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:92
-msgid "List with all available ppd files."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
-msgid "Entries"
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:117
-msgid "selected"
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
-msgid "Please select a PPD or press cancel"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
+#: 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/workstationService.tpl:9
@@ -6333,11 +6247,6 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -6398,6 +6307,166 @@ msgstr ""
 msgid "Provide scan services"
 msgstr ""
 
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:115
+msgid "Description contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:119
+msgid "Path contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:123
+msgid "Option contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
+msgid "Select"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
+msgid ""
+"This menu allows you to select one or multiple entries to be added to the "
+"printer object for specific tasks. Having a great number of entries, you may "
+"want to use the range selectors below."
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
+msgid "Display members of department"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
+msgid "Display members matching"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+msgid "Regular expression for matching member names"
+msgstr ""
+
+#: 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_printerPPDDialog.inc:113
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:120
+#, php-format
+msgid "Can't save file '%s'"
+msgstr ""
+
+#: 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_printerPPDDialog.inc:163
+msgid "Please select a valid ppd."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/fai/faiPackage.tpl:41
+msgid "Section"
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:320
+#: plugins/admin/systems/class_printerPPDDialog.inc:323
+msgid "True"
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:321
+#: plugins/admin/systems/class_printerPPDDialog.inc:324
+msgid "False"
+msgstr ""
+
+#: 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"
@@ -6534,73 +6603,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:67
-msgid "Automount devices (format: complete autofs entry)"
-msgstr ""
-
-#: plugins/admin/systems/terminalStartup.tpl:69
-msgid "Add additional automount entries"
-msgstr ""
-
-#: plugins/admin/systems/terminalStartup.tpl:87
-msgid "Additional fstab entries"
-msgstr ""
-
-#: plugins/admin/systems/terminalStartup.tpl:89
-msgid "Add additional filesystems to be mounted during startup"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr ""
-
 #: plugins/admin/ogroups/tabs_ogroups.inc:59
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 msgid "Phone queue"
@@ -6611,14 +6613,6 @@ msgstr ""
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:97
-msgid "Service"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr ""
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -6671,22 +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
-#: plugins/admin/fai/faiPackageEntry.tpl:50
-msgid "Display objects matching"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/fai/headpage.tpl:51 plugins/admin/fai/faiProfileEntry.tpl:56
-#: plugins/admin/fai/faiPackageEntry.tpl:55
-msgid "Regular expression for matching object names"
-msgstr ""
-
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -6698,52 +6676,8 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "Create new object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Name of object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:124
-msgid "This 'dn' is no object group."
+#: plugins/admin/ogroups/class_ogroup.inc:124
+msgid "This 'dn' is no object group."
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:234
@@ -6795,142 +6729,109 @@ msgid "Non existing dn: "
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:533
-msgid "Object groups need at least one member!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:538
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
-msgid "Generic queue Settings"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:18
-msgid "Down"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:46
-msgid "Timeout"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:62
-msgid "Strategy"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
+#: 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 ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
-msgid "Welcome sound file"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
-msgid "Announce message"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
-msgid "'Thank you' message"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
-msgid "Less Than sound file"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
-msgid "Phone attributes "
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
 msgstr ""
 
 #: plugins/admin/ogroups/mail.tpl:7
@@ -7043,48 +6944,164 @@ msgid ""
 "error."
 msgstr ""
 
-#: 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."
+#: 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: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: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 ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+msgid "Generic queue Settings"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:46
+msgid "Timeout"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:62
+msgid "Strategy"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:74
+msgid "Max queue length"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:82
+msgid "Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:116
+msgid "Welcome sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:124
+msgid "Announce message"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
 msgstr ""
 
-#: 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."
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:524
-#: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:396
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:32
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
+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."
 msgstr ""
 
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
@@ -7178,7 +7195,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:514
 #: plugins/admin/fai/class_faiManagement.inc:515
-#: plugins/admin/fai/class_faiProfile.inc:152
+#: plugins/admin/fai/class_faiProfile.inc:158
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Partition table"
 msgstr ""
@@ -7198,42 +7215,22 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:6
-msgid "List of FAI classes"
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:36
-msgid "Show profiles"
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:38
-msgid "Show scripts"
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:39
-msgid "Show hooks"
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:40
-msgid "Show variables"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:41
-msgid "Show packages"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:42
-msgid "Show partitions"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
 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/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/faiPartitionTable.tpl:34
@@ -7248,36 +7245,44 @@ msgstr ""
 msgid "List of FAI objects (Fully Automatic Installation)"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:24
+#: plugins/admin/fai/faiProfileEntry.tpl:27
 msgid ""
 "This menu allows you to select FAI class names and to add them to the "
 "currently edited profile."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:37
+#: plugins/admin/fai/faiProfileEntry.tpl:40
 msgid "Show only classes with templates"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:39
+#: plugins/admin/fai/faiProfileEntry.tpl:42
 msgid "Show only classes with scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:41
+#: plugins/admin/fai/faiProfileEntry.tpl:44
 msgid "Show only classes with hooks"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:43
+#: plugins/admin/fai/faiProfileEntry.tpl:46
 msgid "Show only classes with variables"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:45
+#: plugins/admin/fai/faiProfileEntry.tpl:48
 msgid "Show only classes with packages"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:47
+#: 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."
@@ -7288,19 +7293,23 @@ msgstr ""
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:95
+#: plugins/admin/fai/class_faiScriptEntry.inc:96
 #: plugins/admin/fai/class_faiVariableEntry.inc:83
-#: plugins/admin/fai/class_faiHookEntry.inc:100
+#: plugins/admin/fai/class_faiHookEntry.inc:101
 #: plugins/admin/fai/class_faiTemplateEntry.inc:161
 msgid "Please enter a name."
 msgstr ""
 
+#: 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/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
 msgid "Choose a priority"
 msgstr ""
 
@@ -7309,24 +7318,24 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:117
+#: plugins/admin/fai/class_faiPackage.inc:118
 msgid "There is no useable package list defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:254
+#: plugins/admin/fai/class_faiPackage.inc:256
 #, php-format
 msgid "Can't read configuration folder '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:336
+#: plugins/admin/fai/class_faiPackage.inc:338
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:342
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:371
+#: plugins/admin/fai/class_faiPackage.inc:373
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
@@ -7339,10 +7348,6 @@ msgstr ""
 msgid "Release"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:41
-msgid "Section"
-msgstr ""
-
 #: plugins/admin/fai/faiPackage.tpl:50
 msgid "Mirror"
 msgstr ""
@@ -7363,57 +7368,89 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:136
+#: 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:144
+#: plugins/admin/fai/class_faiProfile.inc:150
 msgid "Append new class names"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:147
+#: plugins/admin/fai/class_faiProfile.inc:153
 #: plugins/admin/fai/class_faiProfileEntry.inc:115
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:148
+#: plugins/admin/fai/class_faiProfile.inc:154
 #: plugins/admin/fai/class_faiProfileEntry.inc:116
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:149
+#: plugins/admin/fai/class_faiProfile.inc:155
 #: plugins/admin/fai/class_faiProfileEntry.inc:117
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:150
+#: plugins/admin/fai/class_faiProfile.inc:156
 #: plugins/admin/fai/class_faiProfileEntry.inc:118
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:151
+#: plugins/admin/fai/class_faiProfile.inc:157
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:154
+#: plugins/admin/fai/class_faiProfile.inc:160
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:216
+#: plugins/admin/fai/class_faiProfile.inc:223
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:220
+#: plugins/admin/fai/class_faiProfile.inc:227
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:228
+#: plugins/admin/fai/class_faiProfile.inc:235
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
 #: plugins/admin/fai/faiProfile.tpl:32
-msgid "List of used class names"
+msgid "FAI classes"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:6
+msgid "List of FAI classes"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:24
+msgid "This menu allows you to create, delete and edit FAI classes."
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:36
+msgid "Show profiles"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:38
+msgid "Show scripts"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:39
+msgid "Show hooks"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:40
+msgid "Show variables"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:41
+msgid "Show packages"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:42
+msgid "Show partitions"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:177
@@ -7440,56 +7477,44 @@ msgstr ""
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:334
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:339
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
+#: 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_faiPartitionTableEntry.inc:351
+#: 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_faiPartitionTableEntry.inc:357
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: 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_faiPartitionTableEntry.inc:367
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
+#: 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_faiPartitionTableEntry.inc:374
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:371
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr ""
-
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
 msgstr ""
@@ -7518,21 +7543,19 @@ msgstr ""
 msgid "Choose a template to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:34
-msgid "List of hook scripts"
-msgstr ""
-
-#: plugins/admin/fai/faiHook.tpl:40
-msgid "Choose a hook to delete or edit"
+#: plugins/admin/fai/class_faiPartitionTable.inc:219
+#: plugins/admin/fai/class_faiPartitionTable.inc:225
+#, php-format
+msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:216
-#: plugins/admin/fai/class_faiPartitionTable.inc:218
+#: 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_faiHookEntry.inc:96
+#: plugins/admin/fai/class_faiHookEntry.inc:97
 msgid "Please enter a value for script."
 msgstr ""
 
@@ -7721,6 +7744,14 @@ msgstr ""
 msgid "sticky"
 msgstr ""
 
+#: plugins/admin/fai/faiHook.tpl:34
+msgid "List of hook scripts"
+msgstr ""
+
+#: plugins/admin/fai/faiHook.tpl:40
+msgid "Choose a hook to delete or edit"
+msgstr ""
+
 #: plugins/admin/fai/class_faiPackageEntry.inc:43
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -7776,21 +7807,8 @@ msgstr ""
 msgid "Matching mirrors"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Voicemail PIN"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:41
-msgid "Phone PIN"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Phone macro"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
@@ -7865,151 +7883,83 @@ msgstr ""
 msgid "Phone PIN must be 4 characters long."
 msgstr ""
 
-#: 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:893
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1062
-msgid "Stop"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1097
-#, php-format
-msgid "Removed user '%s' from phone queue '%s'."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/main.inc:121
-msgid "Phone settings"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr ""
-
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
+msgid ""
+"The specified phone PIN contains invalid characters, only numeric values are "
+"allowed here."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:893
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
+#: 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/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1062
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1097
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Voicemail PIN"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/phoneaccount/generic.tpl:41
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:60
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "Refresh"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-msgid "Macro"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacro.inc:94
@@ -8070,12 +8020,51 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr ""
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:239
@@ -8111,23 +8100,50 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:35
-msgid "Regular expression for        matching user names"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
+msgstr ""
+
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr ""
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:13
@@ -8147,7 +8163,7 @@ msgstr ""
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:69
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:150
 msgid "Phone number"
 msgstr ""
 
@@ -8212,6 +8228,21 @@ msgstr ""
 msgid "Conference"
 msgstr ""
 
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr ""
+
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:188
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
@@ -8280,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 ""
 
@@ -8462,28 +8493,18 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:437
-#, php-format
+#: include/class_pluglist.inc:98
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_ldap.inc:670
-#, php-format
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:683
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:699
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
 #: include/class_plugin.inc:180
@@ -8512,46 +8533,6 @@ msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-
-#: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-
-#: include/class_ppdManager.inc:57
-#, php-format
-msgid ""
-"Parsing PPD file %s faild - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: include/class_ppdManager.inc:78
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: include/class_config.inc:69
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
@@ -8565,8 +8546,18 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
 #: include/class_password-methods-kerberos.inc:43
@@ -8583,6 +8574,34 @@ msgstr ""
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: 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: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:712
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:728
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -8607,6 +8626,16 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
+#: 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:367
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -8691,318 +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:304
+#: include/functions_setup.inc:314
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:369
+#: include/functions_setup.inc:379
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:373
+#: include/functions_setup.inc:383
 #, php-format
 msgid "Checking for function <b>%s</b>"
 msgstr ""
 
-#: include/functions_setup.inc:374
+#: include/functions_setup.inc:384
 #, php-format
 msgid ""
 "The function <b>%s</b> is used by GOsa. There is no information if it's "
 "optional or required yet."
 msgstr ""
 
-#: include/functions_setup.inc:385
+#: include/functions_setup.inc:395
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:395
+#: include/functions_setup.inc:405
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:398
+#: include/functions_setup.inc:408
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:399
+#: include/functions_setup.inc:409
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:406
+#: include/functions_setup.inc:416
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:407
+#: include/functions_setup.inc:417
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:422
+#: include/functions_setup.inc:432
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:423
+#: include/functions_setup.inc:433
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:436
+#: include/functions_setup.inc:446
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:437
+#: include/functions_setup.inc:447
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:440
+#: include/functions_setup.inc:450
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:441
+#: include/functions_setup.inc:451
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:448
+#: include/functions_setup.inc:458
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:449
+#: include/functions_setup.inc:459
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:462
+#: include/functions_setup.inc:472
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:476
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:467
+#: include/functions_setup.inc:477
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:710
+#: include/functions_setup.inc:720
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:719 include/functions_setup.inc:802
+#: include/functions_setup.inc:729 include/functions_setup.inc:812
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:733 include/functions_setup.inc:807
-#: include/functions_setup.inc:812
+#: include/functions_setup.inc:743 include/functions_setup.inc:817
+#: include/functions_setup.inc:822
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:822
+#: include/functions_setup.inc:832
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:878
+#: include/functions_setup.inc:888
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:909
+#: include/functions_setup.inc:919
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:918
+#: include/functions_setup.inc:928
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1028 include/functions_setup.inc:1051
-#: include/functions_setup.inc:1060 html/index.php:172
+#: include/functions_setup.inc:1038 include/functions_setup.inc:1061
+#: include/functions_setup.inc:1070 html/index.php:172
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -9010,18 +9047,179 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid ""
+"Parsing PPD file %s failed - line too long. Trailing characters have been "
+"ignored"
+msgstr ""
+
+#: 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/functions_helpviewer.inc:335
+#: include/class_ppdManager.inc:263
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
+#: html/helpviewer.php:58
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:93
+msgid "next"
+msgstr ""
+
+#: html/helpviewer.php:154
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
+#: html/helpviewer.php:162 ihtml/themes/default/help.tpl:15
+msgid "Index"
+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
@@ -9036,6 +9234,10 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -9043,44 +9245,26 @@ msgid ""
 "please check existence and rights of this directory!"
 msgstr ""
 
-#: html/main.php:112
+#: html/main.php:114
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:155
+#: html/main.php:157
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:284
+#: html/main.php: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/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
-
-#: html/helpviewer.php:85
-msgid "previous"
-msgstr ""
-
-#: html/helpviewer.php:89
-msgid "next"
-msgstr ""
-
-#: html/helpviewer.php:141
-#, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
-msgstr ""
-
 #: html/index.php:49
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -9145,23 +9329,6 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr ""
-
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
@@ -9184,6 +9351,23 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -9220,6 +9404,22 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
+msgstr ""
+
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -9231,20 +9431,18 @@ msgid ""
 "case by pressing the <i>Remove</i> button."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-msgid "Setup continued..."
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
@@ -9428,18 +9626,8 @@ msgid ""
 "execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:17
@@ -9460,11 +9648,3 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting. "
 "(But it could be a security risk)  "
 msgstr ""
-
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""