updated locales

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

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 4c27c80c174dd7be30c03a0a2dbe22928438d410..e9baaaaffdfdf114f2f8e80e50744118aeee3e80 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2005-11-15 08:51+0100\n"
+"PO-Revision-Date: 2005-11-29 23:17+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,6 @@ msgstr "Zus
 #: 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 "Allgemein"
@@ -62,59 +61,59 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:72 contrib/gosa.conf:84
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:380
-#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/groups/class_groupManagement.inc:377
+#: plugins/admin/users/class_userManagement.inc:730
 msgid "Environment"
 msgstr "Umgebung"
 
 #: contrib/gosa.conf:73 contrib/gosa.conf:86
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/groups/class_groupManagement.inc:373
+#: plugins/admin/users/class_userManagement.inc:732
 #: plugins/admin/ogroups/tabs_ogroups.inc:73
 #: plugins/admin/ogroups/tabs_ogroups.inc:161
-#: plugins/admin/ogroups/class_ogroupManagement.inc:383
+#: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/groups/class_groupManagement.inc:374
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:135
+#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Konnektivität"
 
 #: contrib/gosa.conf:76 html/getxls.php:174 html/getxls.php:236
-#: plugins/personal/generic/generic.tpl:241
-#: plugins/personal/generic/generic.tpl:372
+#: plugins/personal/generic/generic.tpl:248
+#: plugins/personal/generic/generic.tpl:379
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:735
+#: plugins/admin/users/class_userManagement.inc:736
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:77 plugins/personal/generic/generic.tpl:224
-#: plugins/personal/generic/generic.tpl:362
+#: contrib/gosa.conf:77 plugins/personal/generic/generic.tpl:231
+#: plugins/personal/generic/generic.tpl:369
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/address_edit.tpl:96
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/users/class_userManagement.inc:734
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -165,9 +164,9 @@ msgstr "Ger
 
 #: contrib/gosa.conf:112 contrib/gosa.conf:130
 #: plugins/personal/environment/environment.tpl:168
-#: plugins/admin/systems/class_systemManagement.inc:715
+#: plugins/admin/systems/class_systemManagement.inc:714
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:489
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
@@ -208,11 +207,11 @@ msgstr "Export"
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:113
 #: 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/contentcsv.tpl:109
+#: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/admin/applications/generic.tpl:91
 msgid "Import"
 msgstr "Importieren"
@@ -232,18 +231,18 @@ msgstr "Partitionen"
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:551
-#: plugins/admin/fai/class_faiManagement.inc:552
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:553
+#: plugins/admin/fai/class_faiManagement.inc:554
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:544
-#: plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:546
+#: plugins/admin/fai/class_faiManagement.inc:547
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:565
-#: plugins/admin/fai/class_faiManagement.inc:566
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:567
+#: plugins/admin/fai/class_faiManagement.inc:568
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -291,7 +290,7 @@ msgstr "Italienisch"
 msgid "There is no helpfile specified for this class."
 msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
 
-#: html/helpviewer.php:221
+#: html/helpviewer.php:223
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -303,7 +302,7 @@ msgid "Birthday"
 msgstr "Geburtstag"
 
 #: html/getxls.php:65 html/getxls.php:224
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:88
 msgid "Sex"
 msgstr "Geschlecht"
 
@@ -313,10 +312,7 @@ msgid "Surname"
 msgstr "Name"
 
 #: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236 plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/admin/users/template.tpl:23
+#: html/getxls.php:236 plugins/addons/addressbook/class_addressbook.inc:515
 msgid "Given name"
 msgstr "Vorname"
 
@@ -339,7 +335,7 @@ msgstr "Benutzerliste von %s am %s"
 
 #: html/getxls.php:80 html/getxls.php:108 html/getxls.php:123
 #: html/getxls.php:282 html/getxls.php:299
-#: plugins/addons/addressbook/class_addressbook.inc:509
+#: plugins/addons/addressbook/class_addressbook.inc:517
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -413,12 +409,10 @@ msgid "Display name"
 msgstr "Angezeigter Name"
 
 #: html/getxls.php:174 html/getxls.php:233
-#: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
+#: plugins/addons/addressbook/class_addressbook.inc:515
+#: plugins/admin/systems/servnfs.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
@@ -430,7 +424,7 @@ msgstr "Angezeigter Name"
 msgid "Name"
 msgstr "Name"
 
-#: html/getxls.php:174 plugins/addons/addressbook/class_addressbook.inc:509
+#: html/getxls.php:174 plugins/addons/addressbook/class_addressbook.inc:517
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
@@ -439,12 +433,12 @@ msgid "Home postal address"
 msgstr "Private Adresse"
 
 #: html/getxls.php:174 html/getxls.php:236
-#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/address_info.tpl:19
 msgid "Initials"
 msgstr "Initialien"
 
-#: html/getxls.php:174 plugins/personal/generic/generic.tpl:257
+#: html/getxls.php:174 plugins/personal/generic/generic.tpl:264
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
 #: plugins/admin/systems/workstation.tpl:18
@@ -460,7 +454,7 @@ msgid "Mobile phone"
 msgstr "Mobiltelefon"
 
 #: html/getxls.php:174 html/getxls.php:236
-#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_edit.tpl:148
 #: plugins/addons/addressbook/address_info.tpl:67
 msgid "City"
 msgstr "Stadt"
@@ -470,9 +464,9 @@ msgid "Postal address"
 msgstr "Adresse"
 
 #: html/getxls.php:174 html/getxls.php:236
-#: plugins/personal/generic/generic.tpl:235
+#: plugins/personal/generic/generic.tpl:242
 #: plugins/personal/nagios/nagios.tpl:48
-#: plugins/addons/addressbook/address_edit.tpl:102
+#: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91
 msgid "Pager"
 msgstr "Pager"
@@ -482,24 +476,24 @@ msgstr "Pager"
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: html/getxls.php:174 plugins/personal/generic/generic.tpl:121
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_edit.tpl:93
+#: html/getxls.php:174 plugins/personal/generic/generic.tpl:128
+#: plugins/personal/generic/generic.tpl:272
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:54
 msgid "Address"
 msgstr "Adresse"
 
-#: html/getxls.php:174 plugins/personal/generic/generic.tpl:339
-#: plugins/addons/addressbook/address_edit.tpl:81
+#: html/getxls.php:174 plugins/personal/generic/generic.tpl:346
+#: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70
 msgid "Postal code"
 msgstr "Postleitzahl"
 
 #: html/getxls.php:174 html/getxls.php:236
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/admin/departments/generic.tpl:46
 msgid "State"
 msgstr "Land"
@@ -533,14 +527,14 @@ msgstr "UID"
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/getxls.php:236 plugins/personal/generic/generic.tpl:231
+#: html/getxls.php:236 plugins/personal/generic/generic.tpl:238
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:51
+#: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: html/getxls.php:236 plugins/personal/generic/generic.tpl:183
+#: html/getxls.php:236 plugins/personal/generic/generic.tpl:190
 msgid "Organization"
 msgstr "Organisation"
 
@@ -648,7 +642,7 @@ msgstr ""
 "Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: html/index.php:144
+#: html/index.php:145
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -656,7 +650,7 @@ msgstr ""
 "GOsa kann keine Informationen über die verfügbaren Schema-Definitionen "
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
-#: html/index.php:152
+#: html/index.php:153
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
@@ -685,7 +679,7 @@ msgstr "Bitte geben Sie Ihr Passwort ein!"
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:227 ihtml/themes/altlinux/conflict.tpl:6
+#: html/index.php:227 html/index.php:287 ihtml/themes/altlinux/conflict.tpl:6
 #: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 #: ihtml/themes/default/islocked.tpl:6 plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
@@ -696,11 +690,11 @@ msgstr "Bitte 
 msgid "Warning"
 msgstr "Warnung"
 
-#: html/index.php:227
+#: html/index.php:227 html/index.php:287
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:227
+#: html/index.php:227 html/index.php:287
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
@@ -737,7 +731,7 @@ msgstr ""
 
 #: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:82
 msgid "Set"
 msgstr "Setzen"
 
@@ -781,8 +775,8 @@ msgstr ""
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
-#: plugins/admin/users/class_userManagement.inc:689
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/admin/users/class_userManagement.inc:690
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Username"
 msgstr "Benutzername"
 
@@ -791,7 +785,7 @@ msgstr "Benutzername"
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:660
 #: 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
@@ -842,7 +836,7 @@ msgstr ""
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18 plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:396
+#: plugins/admin/fai/class_faiManagement.inc:398
 #: plugins/admin/fai/faiPackageNew.tpl:65
 msgid "Continue"
 msgstr "Fortsetzen"
@@ -905,11 +899,12 @@ msgstr ""
 #: 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 include/functions.inc:1285
+#: ihtml/themes/default/setup_finish.tpl:30 include/functions.inc:1321
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
+#: plugins/personal/generic/main.inc:169
+#: plugins/gofax/faxreports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 msgid "Back"
@@ -937,10 +932,10 @@ msgstr ""
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/personal/environment/environment.tpl:118
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/admin/groups/class_groupMail.inc:412
-#: plugins/admin/applications/class_applicationParameters.inc:97
+#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/applications/class_applicationParameters.inc:98
 #: plugins/admin/systems/printer.tpl:47
-#: plugins/admin/systems/workstationStartup.tpl:93
+#: plugins/admin/systems/workstationStartup.tpl:90
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/fai/faiPackage.tpl:75
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
@@ -969,41 +964,42 @@ msgstr "Entfernen"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:332
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:49
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:634
+#: plugins/admin/users/class_userManagement.inc:635
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:306
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/departments/class_departmentManagement.inc:349
 #: plugins/admin/systems/class_systemManagement.inc:541
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:92
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:341
+#: plugins/admin/ogroups/class_ogroupManagement.inc:340
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/fai/remove.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:392
-#: plugins/admin/fai/class_faiManagement.inc:397
+#: plugins/admin/fai/class_faiManagement.inc:394
+#: plugins/admin/fai/class_faiManagement.inc:399
 #: 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/faiPackageEntry.tpl:64
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:66
-#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:274
+#: plugins/gofon/phoneaccount/main.inc:107 plugins/gofon/macro/remove.tpl:15
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
 #: plugins/gofon/conference/remove.tpl:16
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -1165,7 +1161,7 @@ msgstr "Zustellungs-Methode"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:550
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 msgid "disabled"
@@ -1269,9 +1265,11 @@ msgstr "GOsa Hilfe-Browser"
 msgid "Index"
 msgstr "Index"
 
-#: ihtml/themes/default/help.tpl:21 plugins/gofax/reports/contents.tpl:21
+#: ihtml/themes/default/help.tpl:21 plugins/gofax/faxreports/contents.tpl:21
 #: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:27
+#: plugins/gofon/fonreports/contents.tpl:21
 msgid "Search"
 msgstr "Suchen"
 
@@ -1342,7 +1340,7 @@ msgstr "Zeile"
 #: include/php_setup.inc:122 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/servnfs.tpl:39
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
@@ -1354,28 +1352,28 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/functions.inc:282
+#: include/functions.inc:290
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr "Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:303
+#: include/functions.inc:311
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Anmeldung des Nutzers ist fehlgeschlagen. Die Meldung lautet '%s'."
 
-#: include/functions.inc:322
+#: include/functions.inc:330
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr "Die Kennung ist nicht eindeutig. Bitte prüfen Sie die LDAP-Datenbank."
 
-#: include/functions.inc:360
+#: include/functions.inc:368
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 "Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
 
-#: include/functions.inc:370
+#: include/functions.inc:378
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -1385,20 +1383,20 @@ msgstr ""
 "überprüfen Sie den \"Config\" Eintrag in der Datei gosa.conf! Der LDAP-"
 "Server meldete '%s'."
 
-#: include/functions.inc:385
+#: include/functions.inc:393
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers lautet '%s'."
 
-#: include/functions.inc:411
+#: include/functions.inc:419
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann den Zugriffsschutz nicht entfernen. Die Meldung des LDAP-Servers lautet "
 "'%s'."
 
-#: include/functions.inc:441
+#: include/functions.inc:449
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -1406,7 +1404,7 @@ msgstr ""
 "Es kann nicht geprüft werden, ob das Objekt gesperrt ist. Die Parameter sind "
 "nicht korrekt!"
 
-#: include/functions.inc:451
+#: include/functions.inc:459
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -1414,7 +1412,7 @@ msgstr ""
 "Die Information über den Zugriffsschutz kann nicht aus der LDAP-Datenbank "
 "gelesen werden. Bitte prüfen Sie den \"Config\"-Eintrag in der gosa.conf!"
 
-#: include/functions.inc:459
+#: include/functions.inc:467
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -1422,12 +1420,12 @@ msgstr ""
 "Mehrere Sperrungen für ein Objekt gefunden. Dies sollte nicht möglich sein, "
 "bitte entfernen Sie mehrfache Referenzen."
 
-#: include/functions.inc:573
+#: include/functions.inc:581
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:575
+#: include/functions.inc:583
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1436,15 +1434,15 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:587 plugins/admin/fai/faiPackage.tpl:76
+#: include/functions.inc:595 plugins/admin/fai/faiPackage.tpl:76
 msgid "Configure"
-msgstr "Einstellen"
+msgstr "Konfigurieren"
 
-#: include/functions.inc:592
+#: include/functions.inc:600
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:997
+#: include/functions.inc:1007
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -1454,31 +1452,23 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1096
+#: include/functions.inc:1106
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1276
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/personal/environment/kioskManagement.tpl:24
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/fai/faiProfileEntry.tpl:71
-#: plugins/admin/fai/faiScriptEntry.tpl:67
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
-#: plugins/admin/fai/faiPackageEntry.tpl:65
-msgid "Apply"
-msgstr "Anwenden"
+#: include/functions.inc:1284
+msgid "Entries per page"
+msgstr "Einträge pro Seite"
+
+#: include/functions.inc:1312
+msgid "Apply filter"
+msgstr "Filter anwenden"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1586
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1593
+#: include/functions.inc:1629
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -1694,24 +1684,24 @@ msgstr "Kein g
 msgid "XML error in guide.xml: %s at line %d"
 msgstr "XML-Fehler in der Datei guide.xml: %s in Zeile %d"
 
-#: include/functions_helpviewer.inc:83
+#: include/functions_helpviewer.inc:86
 msgid "No help available for this plugin."
 msgstr "Für dieses Modul ist keine Hilfe verfügbar."
 
-#: include/functions_helpviewer.inc:92
+#: include/functions_helpviewer.inc:95
 msgid "previous"
 msgstr "Vorherige"
 
-#: include/functions_helpviewer.inc:96
+#: include/functions_helpviewer.inc:99
 msgid "next"
 msgstr "Nächste"
 
-#: include/functions_helpviewer.inc:384
+#: include/functions_helpviewer.inc:387
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr "%s Ergebnisse für Ihre Suche nach %s (effektiv gesucht nach: %s)"
 
-#: include/functions_helpviewer.inc:459
+#: include/functions_helpviewer.inc:462
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
@@ -2241,12 +2231,16 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information "
 "gefunden."
 
+#: include/class_debconfTemplate.inc:251
+msgid "This package has no debconf options."
+msgstr "Dieses Paket verfügt über keine debconf-Optionen."
+
 #: include/class_xmlParse.inc:42
 #, php-format
 msgid "Could not open XML input '%s'."
 msgstr "Kann die XML-Datei '%s' nicht öffnen."
 
-#: include/class_xmlParse.inc:116
+#: include/class_xmlParse.inc:117
 #, php-format
 msgid "XML error in %s : %s at line %d"
 msgstr "XML-Fehler in der Datei %s: %s in Zeile %d"
@@ -2271,12 +2265,12 @@ msgstr "XML-Fehler in der Datei %s: %s in Zeile %d"
 #: 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/gofax/faxreports/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_export.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
@@ -2287,8 +2281,8 @@ msgstr "XML-Fehler in der Datei %s: %s in Zeile %d"
 #: 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
+#: plugins/gofon/fonreports/class_fonreport.inc:7
 msgid "This does something"
 msgstr "Dies tut etwas"
 
@@ -2300,22 +2294,22 @@ msgstr ""
 "Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
 "verfügbar."
 
-#: plugins/personal/mail/class_mailAccount.inc:163
+#: plugins/personal/mail/class_mailAccount.inc:170
 msgid "No DESC tag in vacation file:"
 msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
 
-#: plugins/personal/mail/class_mailAccount.inc:203
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "This account has no mail extensions."
 msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/personal/mail/class_mailAccount.inc:219
+#: plugins/admin/groups/class_groupMail.inc:195
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
-#: plugins/personal/mail/class_mailAccount.inc:213
-#: plugins/admin/groups/class_groupMail.inc:191
+#: plugins/personal/mail/class_mailAccount.inc:220
+#: plugins/admin/groups/class_groupMail.inc:196
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -2323,14 +2317,14 @@ msgstr ""
 "Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:215
-#: plugins/admin/groups/class_groupMail.inc:193
+#: plugins/personal/mail/class_mailAccount.inc:222
+#: plugins/admin/groups/class_groupMail.inc:198
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
-#: plugins/personal/mail/class_mailAccount.inc:215
-#: plugins/admin/groups/class_groupMail.inc:194
+#: plugins/personal/mail/class_mailAccount.inc:222
+#: plugins/admin/groups/class_groupMail.inc:199
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -2338,81 +2332,81 @@ msgstr ""
 "Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
 "Sie auf die untere Schaltfläche klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:263
+#: plugins/personal/mail/class_mailAccount.inc:270
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
 "aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:253
+#: plugins/personal/mail/class_mailAccount.inc:276
+#: plugins/admin/groups/class_groupMail.inc:258
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
 "Sinn."
 
-#: plugins/personal/mail/class_mailAccount.inc:304
-#: plugins/personal/mail/class_mailAccount.inc:309
-#: plugins/admin/groups/class_groupMail.inc:281
+#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:319
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/personal/mail/class_mailAccount.inc:326
+#: plugins/admin/groups/class_groupMail.inc:291
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
 "anderen Benutzer verwendet"
 
-#: plugins/personal/mail/class_mailAccount.inc:693
+#: plugins/personal/mail/class_mailAccount.inc:700
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Es wurde kein gültiger Mail-Server angegeben, bitte fügen Sie ein passendes "
 "System hinzu."
 
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/admin/groups/class_groupMail.inc:619
 msgid "The required field 'Primary address' is not set."
 msgstr "Das benötigte Feld 'Primäre Adresse' ist nicht gesetzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/personal/mail/class_mailAccount.inc:706
-#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/personal/mail/class_mailAccount.inc:713
+#: plugins/addons/addressbook/class_addressbook.inc:590
 #: plugins/admin/ogroups/class_mailogroup.inc:70
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/personal/mail/class_mailAccount.inc:713
-#: plugins/admin/groups/class_groupMail.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:720
+#: plugins/admin/groups/class_groupMail.inc:628
 #: plugins/admin/ogroups/class_mailogroup.inc:77
 msgid "The primary address you've entered is already in use."
 msgstr ""
 "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:629
+#: plugins/personal/mail/class_mailAccount.inc:726
+#: plugins/admin/groups/class_groupMail.inc:634
 msgid "Value in 'Quota size' is not valid."
 msgstr "Das Feld 'Kontingent-Größe' enthält einen ungültigen Wert."
 
-#: plugins/personal/mail/class_mailAccount.inc:728
-#: plugins/admin/groups/class_groupMail.inc:638
+#: plugins/personal/mail/class_mailAccount.inc:735
+#: plugins/admin/groups/class_groupMail.inc:643
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Bitte geben Sie eine gültige Größenbeschränkung für Mails an, die abgewiesen "
 "werden sollen."
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-#: plugins/admin/groups/class_groupMail.inc:646
+#: plugins/personal/mail/class_mailAccount.inc:745
+#: plugins/admin/groups/class_groupMail.inc:651
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
-#: plugins/personal/mail/class_mailAccount.inc:742
+#: plugins/personal/mail/class_mailAccount.inc:749
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
@@ -2422,48 +2416,48 @@ msgid "Primary address"
 msgstr "Primäre Adresse"
 
 #: plugins/personal/mail/generic.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:32 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:710
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/addons/mailqueue/contents.tpl:55 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
 
-#: plugins/personal/mail/generic.tpl:13
+#: plugins/personal/mail/generic.tpl:14
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto verwaltet werden soll"
 
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Kontingent-Nutzung"
 
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:150
-#: plugins/admin/systems/class_printGeneric.inc:367
+#: plugins/admin/systems/class_printGeneric.inc:369
 msgid "not defined"
 msgstr "nicht definiert"
 
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:45
+#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
 #: plugins/admin/systems/phonesettings.tpl:170
 #: plugins/admin/systems/phonesettings.tpl:185
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
 #: 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/samba/samba3.tpl:307
+#: plugins/personal/samba/samba3.tpl:319
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/personal/connectivity/kolab.tpl:18
@@ -2478,8 +2472,8 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:408
-#: plugins/admin/groups/application.tpl:13
+#: plugins/admin/groups/class_groupMail.inc:413
+#: plugins/admin/groups/application.tpl:14
 #: plugins/admin/groups/group_objects.tpl:47
 #: plugins/admin/groups/generic.tpl:103
 #: plugins/admin/groups/mail_locals.tpl:66
@@ -2488,9 +2482,9 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:53
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/workstationStartup.tpl:92
+#: plugins/admin/systems/workstationStartup.tpl:50
+#: plugins/admin/systems/workstationStartup.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:89
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
@@ -2505,10 +2499,10 @@ msgstr "Liste alternativer Mail-Adressen"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:309
+#: plugins/personal/samba/samba3.tpl:321
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/personal/environment/environment.tpl:135
 #: plugins/personal/environment/environment.tpl:162
@@ -2528,8 +2522,8 @@ msgstr "Hinzuf
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/workstationStartup.tpl:54
-#: plugins/admin/systems/workstationStartup.tpl:74
+#: plugins/admin/systems/workstationStartup.tpl:51
+#: plugins/admin/systems/workstationStartup.tpl:71
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25 plugins/admin/fai/remove.tpl:15
@@ -2541,89 +2535,89 @@ msgstr "Hinzuf
 msgid "Delete"
 msgstr "Entfernen"
 
-#: plugins/personal/mail/generic.tpl:66
+#: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr "Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 "Wählen Sie diese Einstellung, wenn Mails lediglich weitergeleitet werden "
 "sollen. Eine lokale Kopie wird nicht gespeichert."
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Wählen Sie dies, um automatisch eine Urlaubsmeldung zu generieren"
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Wählen Sie dies, um Mails von Spamassassin filtern zu lassen"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verschiebe Mails mit einem SPAM-Level größer als"
 
-#: plugins/personal/mail/generic.tpl:83
+#: plugins/personal/mail/generic.tpl:84
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:87
 msgid "to folder"
 msgstr "in den Ordner"
 
-#: plugins/personal/mail/generic.tpl:93
+#: plugins/personal/mail/generic.tpl:94
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen, die größer sind als"
 
-#: plugins/personal/mail/generic.tpl:95
-#: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/mail/generic.tpl:96
+#: plugins/personal/connectivity/pureftpd.tpl:44
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 #: plugins/personal/environment/environment.tpl:71
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:102
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:119
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:130
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Wählen Sie dies wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
 "und empfangen darf"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:146
 msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
@@ -2636,16 +2630,16 @@ msgstr "schaltet alle 
 #: plugins/personal/nagios/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:331
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:633
 #: plugins/admin/applications/class_applicationManagement.inc:304
-#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/departments/class_departmentManagement.inc:347
 #: plugins/admin/systems/class_systemManagement.inc:539
-#: plugins/admin/ogroups/class_ogroupManagement.inc:339
-#: plugins/admin/fai/class_faiManagement.inc:390
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:272
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/fai/class_faiManagement.inc:392
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
 msgid "Finish"
 msgstr "Speichern"
 
@@ -2654,7 +2648,7 @@ msgstr "Speichern"
 #: 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
+#: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
@@ -2674,7 +2668,7 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
 #: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:112
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -2706,7 +2700,7 @@ msgstr "W
 #: 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/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 msgid "Filters"
@@ -2745,7 +2739,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -2946,13 +2940,13 @@ msgid "User must change password on first login"
 msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort ändern"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:245
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:256
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:85
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:638
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -2964,8 +2958,10 @@ msgstr "Shell"
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/detail.tpl:46
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
 msgstr "Status"
 
@@ -3006,32 +3002,32 @@ msgstr "UNIX-Einstellungen"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:135
+#: plugins/personal/posix/class_posixAccount.inc:966
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:193
 #: plugins/admin/systems/class_terminalService.inc:122
 #: plugins/admin/systems/class_workstationService.inc:107
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:222
+#: plugins/personal/posix/class_posixAccount.inc:224
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto besitzt keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:243
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -3039,7 +3035,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte UNIX-Erweiterungen. Um sie zu deaktivieren, "
 "müssen Sie zunächst die Samba- und Umgebungserweiterungen deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:249
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -3047,11 +3043,11 @@ msgstr ""
 "Dieses Konto besitzt aktivierte UNIX-Erweiterungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:250
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:253
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -3059,239 +3055,239 @@ msgstr ""
 "Dieses Konto besitzt keine aktivierten UNIX-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Der Benutzer muß sein Passwort nach %s Tagen ändern"
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr "Konto nach %s Tagen nach Ablauf ohne Aktivität deaktivieren"
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:443
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/posix/class_posixAccount.inc:467
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Januar"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/posix/class_posixAccount.inc:467
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Februar"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/posix/class_posixAccount.inc:467
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "März"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/posix/class_posixAccount.inc:467
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:468
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:468
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:468
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:468
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "August"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:468
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:469
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:469
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:469
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Dezember"
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:550
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:549
+#: plugins/personal/posix/class_posixAccount.inc:551
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/personal/posix/class_posixAccount.inc:718
+#: plugins/personal/posix/class_posixAccount.inc:721
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "The required field 'Home directory' is not set."
 msgstr "Das benötigte Feld 'Basisverzeichnis' ist nicht gesetzt."
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:883
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
-#: plugins/personal/posix/class_posixAccount.inc:888
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'UID' is not valid."
 msgstr "Die von ihnen angebene 'UID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:894
 msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:895
-#: plugins/admin/groups/class_groupGeneric.inc:657
+#: plugins/personal/posix/class_posixAccount.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:662
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:898
-#: plugins/admin/groups/class_groupGeneric.inc:660
+#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:909
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMin' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:914
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMax' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowWarning' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:925
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/personal/posix/class_posixAccount.inc:928
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowInactive' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:933
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:941
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr "Der angegebene Wert 'shadowMin' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:1042
-#: plugins/admin/groups/class_groupGeneric.inc:691
+#: plugins/personal/posix/class_posixAccount.inc:1063
+#: plugins/admin/groups/class_groupGeneric.inc:696
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
@@ -3306,20 +3302,20 @@ msgid "Script path"
 msgstr "Anmeldeskript"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:95
-#: plugins/personal/samba/class_sambaAccount.inc:634
+#: plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/class_sambaAccount.inc:639
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:230
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:241
 msgid "Access options"
 msgstr "Zugriffsoptionen"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:236
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:247
 msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:250
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
@@ -3335,91 +3331,91 @@ msgstr "Dom
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: plugins/personal/samba/samba3.tpl:82
+#: plugins/personal/samba/samba3.tpl:91
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: plugins/personal/samba/samba3.tpl:107
+#: plugins/personal/samba/samba3.tpl:118
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
-#: plugins/personal/samba/samba3.tpl:110
+#: plugins/personal/samba/samba3.tpl:121
 msgid "Initial program"
 msgstr "Startprogramm"
 
-#: plugins/personal/samba/samba3.tpl:116
+#: plugins/personal/samba/samba3.tpl:127
 msgid "Working directory"
 msgstr "Arbeitsverzeichnis"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:142
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: plugins/personal/samba/samba3.tpl:136
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/samba3.tpl:147
+#: plugins/personal/samba/class_sambaAccount.inc:646
 msgid "Connection"
 msgstr "Verbinden"
 
-#: plugins/personal/samba/samba3.tpl:145
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/samba3.tpl:156
+#: plugins/personal/samba/class_sambaAccount.inc:647
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: plugins/personal/samba/samba3.tpl:154
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:165
+#: plugins/personal/samba/class_sambaAccount.inc:648
 msgid "IDLE"
 msgstr "Leerlauf"
 
-#: plugins/personal/samba/samba3.tpl:167
+#: plugins/personal/samba/samba3.tpl:178
 msgid "Client devices"
 msgstr "Client-Geräte"
 
-#: plugins/personal/samba/samba3.tpl:172
+#: plugins/personal/samba/samba3.tpl:183
 msgid "Connect client drives at logon"
 msgstr "Client-Laufwerke beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:178
+#: plugins/personal/samba/samba3.tpl:189
 msgid "Connect client printers at logon"
 msgstr "Client-Drucker beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:184
+#: plugins/personal/samba/samba3.tpl:195
 msgid "Default to main client printer"
 msgstr "Standard-Drucker vom Client wählen"
 
-#: plugins/personal/samba/samba3.tpl:194
-#: plugins/personal/connectivity/pureftpd.tpl:64
+#: plugins/personal/samba/samba3.tpl:205
+#: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/samba3.tpl:209
 msgid "Shadowing"
 msgstr "Spiegeln"
 
-#: plugins/personal/samba/samba3.tpl:207
+#: plugins/personal/samba/samba3.tpl:218
 msgid "On broken or timed out"
 msgstr "Bei Trennung oder abgelaufenem Zeitlimit"
 
-#: plugins/personal/samba/samba3.tpl:215
+#: plugins/personal/samba/samba3.tpl:226
 msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
-#: plugins/personal/samba/samba3.tpl:242
+#: plugins/personal/samba/samba3.tpl:253
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: plugins/personal/samba/samba3.tpl:257
+#: plugins/personal/samba/samba3.tpl:268
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
-#: plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba3.tpl:280
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
-#: plugins/personal/samba/samba3.tpl:281
+#: plugins/personal/samba/samba3.tpl:293
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
-#: plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/samba3.tpl:313
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
@@ -3505,12 +3501,12 @@ msgstr "von jedem Client"
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:636
+#: plugins/personal/samba/class_sambaAccount.inc:641
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:651
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -3518,7 +3514,7 @@ msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/class_sambaAccount.inc:657
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -3526,7 +3522,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:836
+#: plugins/personal/samba/class_sambaAccount.inc:841
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -3534,7 +3530,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:866
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -3583,55 +3579,55 @@ msgstr "ung
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:838
+#: plugins/personal/generic/class_user.inc:840
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:855
+#: plugins/personal/generic/class_user.inc:857
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:866
+#: plugins/personal/generic/class_user.inc:868
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:898
 msgid "Invalid characters in uid."
 msgstr "Das Feld 'UID' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/personal/generic/class_user.inc:915
+#: plugins/personal/generic/class_user.inc:917
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:921
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:546
+#: plugins/personal/generic/class_user.inc:923
+#: plugins/addons/addressbook/class_addressbook.inc:547
+#: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:930
+#: plugins/personal/generic/class_user.inc:932
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:534
-#: plugins/admin/users/class_userManagement.inc:549
+#: plugins/personal/generic/class_user.inc:938
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/users/class_userManagement.inc:550
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:939
+#: plugins/personal/generic/class_user.inc:941
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:946
+#: plugins/personal/generic/class_user.inc:948
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -3639,7 +3635,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:955
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -3647,50 +3643,50 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:956
+#: plugins/personal/generic/class_user.inc:958
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
 
-#: plugins/personal/generic/class_user.inc:959
-#: plugins/personal/generic/class_user.inc:987
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:568
-#: plugins/admin/departments/class_departmentGeneric.inc:169
+#: plugins/personal/generic/class_user.inc:961
+#: plugins/personal/generic/class_user.inc:989
+#: plugins/addons/addressbook/class_addressbook.inc:557
+#: plugins/addons/addressbook/class_addressbook.inc:585
+#: plugins/admin/departments/class_departmentGeneric.inc:176
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:962
-#: plugins/personal/generic/class_user.inc:984
-#: plugins/addons/addressbook/class_addressbook.inc:543
-#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/personal/generic/class_user.inc:964
+#: plugins/personal/generic/class_user.inc:986
+#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/addons/addressbook/class_addressbook.inc:582
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:967
-#: plugins/personal/generic/class_user.inc:970
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:172
+#: plugins/personal/generic/class_user.inc:969
+#: plugins/personal/generic/class_user.inc:972
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/admin/departments/class_departmentGeneric.inc:179
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:554
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/personal/generic/class_user.inc:975
+#: plugins/addons/addressbook/class_addressbook.inc:571
+#: plugins/admin/departments/class_departmentGeneric.inc:182
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:976
-#: plugins/addons/addressbook/class_addressbook.inc:557
+#: plugins/personal/generic/class_user.inc:978
+#: plugins/addons/addressbook/class_addressbook.inc:574
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:979
-#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/personal/generic/class_user.inc:981
+#: plugins/addons/addressbook/class_addressbook.inc:577
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1106
+#: plugins/personal/generic/class_user.inc:1108
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
@@ -3718,29 +3714,45 @@ msgstr "Bild"
 msgid "Change picture"
 msgstr "Bild ändern"
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+#: plugins/personal/generic/generic.tpl:25
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/admin/users/template.tpl:23
+msgid "Last name"
+msgstr "Nachname"
+
+#: plugins/personal/generic/generic.tpl:30
+msgid "Template name"
+msgstr "Name der Vorlage"
+
+#: plugins/personal/generic/generic.tpl:37
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:19
+msgid "First name"
+msgstr "Vorname"
+
+#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
 msgid "Login"
 msgstr "Kennung"
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/personal/generic/generic.tpl:49
+#: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/generic.tpl:50
+#: plugins/personal/generic/generic.tpl:57
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/generic.tpl:58
+#: plugins/personal/generic/generic.tpl:65
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/generic.tpl:91
+#: plugins/personal/generic/generic.tpl:98
 msgid "Preferred langage"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/generic.tpl:102
+#: plugins/personal/generic/generic.tpl:109
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/departments/generic.tpl:27
@@ -3753,120 +3765,120 @@ msgstr "Bevorzugte Sprache"
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/generic.tpl:106
+#: plugins/personal/generic/generic.tpl:113
 msgid "Choose subtree to place user in"
 msgstr "Wählen Sie den Unterbaum, in den der Benutzer eingepflegt werden soll"
 
-#: plugins/personal/generic/generic.tpl:125
+#: plugins/personal/generic/generic.tpl:132
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/generic.tpl:129
+#: plugins/personal/generic/generic.tpl:136
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/generic.tpl:145
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:148
+#: plugins/personal/generic/generic.tpl:155
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:157
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:154
+#: plugins/personal/generic/generic.tpl:161
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:162
 msgid "Edit properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:171
+#: plugins/personal/generic/generic.tpl:178
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:187
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/addons/addressbook/address_edit.tpl:75
+#: plugins/personal/generic/generic.tpl:194
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:388
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/class_applicationManagement.inc:357
 #: plugins/admin/systems/class_systemManagement.inc:589
-#: plugins/admin/ogroups/class_ogroupManagement.inc:417
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/admin/ogroups/class_ogroupManagement.inc:416
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:198
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:197
+#: plugins/personal/generic/generic.tpl:204
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:203
+#: plugins/personal/generic/generic.tpl:210
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/generic.tpl:219
-#: plugins/personal/generic/generic.tpl:358
+#: plugins/personal/generic/generic.tpl:226
+#: plugins/personal/generic/generic.tpl:365
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/generic.tpl:286
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/generic.tpl:283
+#: plugins/personal/generic/generic.tpl:290
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/generic.tpl:291
+#: plugins/personal/generic/generic.tpl:298
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/generic.tpl:299
+#: plugins/personal/generic/generic.tpl:306
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:306
+#: plugins/personal/generic/generic.tpl:313
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:325
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/generic.tpl:326
+#: plugins/personal/generic/generic.tpl:333
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/generic.tpl:333
+#: plugins/personal/generic/generic.tpl:340
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/generic.tpl:345
+#: plugins/personal/generic/generic.tpl:352
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:374
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
-#: plugins/personal/generic/generic.tpl:380
+#: plugins/personal/generic/generic.tpl:387
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/personal/generic/generic.tpl:394
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
@@ -3875,8 +3887,8 @@ msgid "Remove picture"
 msgstr "Bild entfernen"
 
 #: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/systems/servnfs.tpl:75
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 msgid "Save"
 msgstr "Sichern"
@@ -3910,23 +3922,23 @@ msgstr "Generische Benutzer-Information"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
@@ -3934,25 +3946,25 @@ msgstr "Das Feld 'Verh
 msgid "PHPGroupware"
 msgstr "phpGroupware"
 
-#: plugins/personal/connectivity/proxy.tpl:16
+#: plugins/personal/connectivity/proxy.tpl:10
 msgid "Proxy account"
 msgstr "Proxy Konto"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:18
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 "Filtern von unerwünschten Inhalten (z.B. pornografische oder gewalttätige "
 "Inhalte)"
 
-#: plugins/personal/connectivity/proxy.tpl:35
+#: plugins/personal/connectivity/proxy.tpl:24
 msgid "Limit proxy access to working time"
 msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
-#: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/proxy.tpl:54
 msgid "Restrict proxy usage by quota"
 msgstr "Proxynutzung durch Kontingent einschränken"
 
-#: plugins/personal/connectivity/proxy.tpl:80
+#: plugins/personal/connectivity/proxy.tpl:65
 msgid "per"
 msgstr "pro"
 
@@ -4023,7 +4035,7 @@ msgstr ""
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
+#: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
 
@@ -4073,7 +4085,7 @@ msgstr "Tage"
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
-#: plugins/personal/connectivity/webdav.tpl:1
+#: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "WebDAV-Konto"
 
@@ -4121,54 +4133,54 @@ msgstr ""
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "PHP4-Erweiterung für PostgreSQL-Datenbank wurde nicht gefunden!"
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
+#: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
 msgstr "FTP Konto"
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
+#: plugins/personal/connectivity/pureftpd.tpl:15
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/personal/connectivity/pureftpd.tpl:19
 msgid "Upload bandwidth"
 msgstr "Upload-Bandbreite"
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
 #: plugins/personal/connectivity/pureftpd.tpl:20
+#: plugins/personal/connectivity/pureftpd.tpl:24
 msgid "kb/s"
 msgstr "kb/s"
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
+#: plugins/personal/connectivity/pureftpd.tpl:23
 msgid "Download bandwidth"
 msgstr "Download-Bandbreite"
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/connectivity/pureftpd.tpl:35
 #: plugins/personal/environment/environment.tpl:65
 msgid "Quota"
 msgstr "Kontingent"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
+#: plugins/personal/connectivity/pureftpd.tpl:39
 msgid "Files"
 msgstr "Dateien"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-#: plugins/addons/mailqueue/contents.tpl:33
+#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/addons/mailqueue/contents.tpl:56
 msgid "Size"
 msgstr "Größe"
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
+#: plugins/personal/connectivity/pureftpd.tpl:54
 msgid "Ratio"
 msgstr "Verhältnis"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:58
 msgid "Uploaded / downloaded files"
 msgstr "Hoch- / heruntergeladene Dateien"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Check to disable FTP Access"
 msgstr "Wählen Sie diese Option, um FTP-Zugriff zu deaktivieren"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Temporary disable FTP access"
 msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
@@ -4204,7 +4216,7 @@ msgstr "Benutzerinformation"
 msgid "User Timezone"
 msgstr "Zeitzone des Benutzers"
 
-#: plugins/personal/connectivity/intranet.tpl:1
+#: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
@@ -4217,36 +4229,36 @@ msgstr "Dieses Konto besitzt keine Konnektivit
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
-#: plugins/addons/mailqueue/class_mailqueue.inc:170
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:299
 msgid "hour"
 msgstr "Stunde"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "day"
 msgstr "Tag"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "week"
 msgstr "Woche"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "month"
 msgstr "Monat"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:133
+#: plugins/personal/connectivity/class_proxyAccount.inc:169
 msgid "Numerical value for Quota Setting is empty."
 msgstr "Das numerische Feld der Kontingent-Einstellung ist leer."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:136
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
@@ -4263,11 +4275,11 @@ msgstr "PHPscheduleit"
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/phpscheduleit.tpl:1
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr "PHPscheduleit-Konto"
 
-#: plugins/personal/connectivity/pptp.tpl:1
+#: plugins/personal/connectivity/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP-Konto"
 
@@ -4319,18 +4331,18 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:485
-#: plugins/personal/environment/class_environment.inc:487
+#: plugins/personal/environment/class_environment.inc:486
+#: plugins/personal/environment/class_environment.inc:488
 #: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:280
+#: plugins/admin/systems/class_workstationStartup.inc:345
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:716
+#: plugins/personal/environment/class_environment.inc:717
 msgid "Please set a valid profile quota size."
 msgstr "Bitte wählen Sie eine gültige Kontingent-Grösse."
 
-#: plugins/personal/environment/class_environment.inc:723
+#: plugins/personal/environment/class_environment.inc:724
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -4338,21 +4350,21 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:745
+#: plugins/personal/environment/class_environment.inc:746
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Das neue Kiosk-Profil kann nicht gespeichert werden. Wahrscheinlich besitzen "
 "Sie nicht die nötigen Rechte."
 
-#: plugins/personal/environment/class_environment.inc:838
+#: plugins/personal/environment/class_environment.inc:839
 msgid "Error while writing printer"
 msgstr "Fehler beim Speichern des Druckers"
 
-#: plugins/personal/environment/class_environment.inc:908
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer settings"
 msgstr "Fehler beim Speichern der Drucker-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1030
+#: plugins/personal/environment/class_environment.inc:1031
 msgid "Admin"
 msgstr "Administrator"
 
@@ -4409,13 +4421,13 @@ msgid "Resolution"
 msgstr "Auflösung"
 
 #: plugins/personal/environment/environment.tpl:103
-#: plugins/admin/systems/workstationStartup.tpl:78
+#: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Shares"
 msgstr "Freigaben"
 
 #: plugins/personal/environment/environment.tpl:116
-#: plugins/admin/systems/workstationStartup.tpl:91
+#: plugins/admin/systems/workstationStartup.tpl:88
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr "Mount-Pfad"
@@ -4439,8 +4451,8 @@ msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
 #: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "New"
 msgstr "Neu"
 
@@ -4557,6 +4569,22 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 msgid "Logon script"
 msgstr "Anmelde-Skript"
 
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/personal/environment/kioskManagement.tpl:24
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiHookEntry.tpl:69
+#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: plugins/admin/fai/faiPackageEntry.tpl:63
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+msgid "Apply"
+msgstr "Anwenden"
+
 #: plugins/personal/environment/class_logonManagementDialog.inc:96
 msgid "Specified name is invalid."
 msgstr "Der angegebene Name ist ungültig."
@@ -4771,226 +4799,227 @@ msgstr "Fax-Sperrlisten"
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Sie möchten die Sperrliste '%s' löschen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:220
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:218
 msgid "You have no permission to remove this blocklist."
 msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:236
 msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Up"
 msgstr "Auf"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:671
 #: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/fai/class_faiManagement.inc:431
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:671
 #: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:361
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/admin/ogroups/class_ogroupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:431
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Root"
 msgstr "Wurzel"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:328
 #: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/ogroups/class_ogroupManagement.inc:361
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:328
-#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/fai/class_faiManagement.inc:434
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Home"
 msgstr "Heimat"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "New Blocklist"
 msgstr "Neue Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:299
-#: plugins/admin/groups/class_groupManagement.inc:359
-#: plugins/admin/users/class_userManagement.inc:676
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:677
 #: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:286
+#: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:576
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/admin/fai/class_faiManagement.inc:461
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:333
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/admin/ogroups/class_ogroupManagement.inc:366
+#: plugins/admin/fai/class_faiManagement.inc:463
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Current base"
 msgstr "Momentane Basis"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/groups/class_groupManagement.inc:360
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/users/class_userManagement.inc:678
 #: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/admin/fai/class_faiManagement.inc:464
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/groups/class_groupManagement.inc:360
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/users/class_userManagement.inc:678
 #: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/admin/fai/class_faiManagement.inc:464
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit"
 msgstr "Übertragen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:361
+#: plugins/admin/users/class_userManagement.inc:681
 #: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:582
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/admin/fai/class_faiManagement.inc:480
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/admin/fai/class_faiManagement.inc:482
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/users/class_userManagement.inc:680
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/addons/mailqueue/contents.tpl:95
+#: plugins/admin/groups/class_groupManagement.inc:362
+#: plugins/admin/users/class_userManagement.inc:683
 #: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:295
+#: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:583
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/admin/fai/class_faiManagement.inc:481
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/admin/fai/class_faiManagement.inc:483
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/admin/users/class_userManagement.inc:682
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 msgid "Blocklist name"
 msgstr "Name der Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:390
-#: plugins/admin/users/class_userManagement.inc:691
+#: plugins/admin/groups/class_groupManagement.inc:387
+#: plugins/admin/users/class_userManagement.inc:692
 #: plugins/admin/applications/class_applicationManagement.inc:358
-#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/ogroups/class_ogroupManagement.inc:394
-#: plugins/admin/fai/class_faiManagement.inc:477
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:393
+#: plugins/admin/fai/class_faiManagement.inc:479
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
 msgid "Actions"
 msgstr "Aktionen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Diese Tabelle enthält Sperrlisten des ausgewählten Unterbaums."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:516
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
-#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:522
+#: plugins/admin/departments/class_departmentGeneric.inc:164
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:537
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:533
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:540
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
@@ -5148,7 +5177,7 @@ msgid "FAX settings"
 msgstr "Fax-Einstellungen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:99
+#: plugins/addons/addressbook/address_edit.tpl:206
 #: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
@@ -5188,8 +5217,9 @@ msgstr "Sie versuchen, eine ung
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
-#: plugins/admin/groups/class_groupApplication.inc:307
-#: plugins/admin/groups/class_groupApplication.inc:358
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/groups/class_groupApplication.inc:365
+#: plugins/admin/groups/class_groupApplication.inc:416
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
 msgid "back"
 msgstr "zurück"
@@ -5219,151 +5249,167 @@ msgstr ""
 "'Fax an Drucker weiterleiten' ist nur möglich, wenn ein gültiger Drucker "
 "angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
 
-#: plugins/gofax/reports/detail.tpl:6
+#: plugins/gofax/faxreports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr "Fax Vorschau - bitte warten"
 
-#: plugins/gofax/reports/detail.tpl:9
+#: plugins/gofax/faxreports/detail.tpl:9
 msgid "Click on fax to download"
 msgstr "Klicken Sie auf das Fax, um es herunterzuladen"
 
-#: plugins/gofax/reports/detail.tpl:18
+#: plugins/gofax/faxreports/detail.tpl:18
 msgid "FAX ID"
 msgstr "Fax-ID"
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/gofax/faxreports/detail.tpl:22
+#: plugins/gofax/faxreports/contents.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:589
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/gofax/reports/detail.tpl:26
+#: plugins/gofax/faxreports/detail.tpl:26
 msgid "Date / Time"
 msgstr "Datum / Zeit"
 
-#: plugins/gofax/reports/detail.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:30
 msgid "Sender MSN"
 msgstr "Absender-MSN"
 
-#: plugins/gofax/reports/detail.tpl:34
+#: plugins/gofax/faxreports/detail.tpl:34
 msgid "Sender ID"
 msgstr "Absender-ID"
 
-#: plugins/gofax/reports/detail.tpl:38
+#: plugins/gofax/faxreports/detail.tpl:38
 msgid "Receiver MSN"
 msgstr "Empfänger-MSN"
 
-#: plugins/gofax/reports/detail.tpl:42
+#: plugins/gofax/faxreports/detail.tpl:42
 msgid "Receiver ID"
 msgstr "Empfänger-ID"
 
-#: plugins/gofax/reports/detail.tpl:50
+#: plugins/gofax/faxreports/detail.tpl:50
 msgid "Status message"
 msgstr "Status-Nachricht"
 
-#: plugins/gofax/reports/detail.tpl:54
+#: plugins/gofax/faxreports/detail.tpl:54
 msgid "Transfer time"
 msgstr "Übertragungszeit"
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+#: plugins/gofax/faxreports/detail.tpl:58
+#: plugins/gofax/faxreports/contents.tpl:35
 msgid "# pages"
 msgstr "# Seiten"
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
+#: plugins/gofax/faxreports/contents.tpl:2
+#: plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/fonreports/contents.tpl:2
 msgid "Filter"
 msgstr "Filter"
 
-#: plugins/gofax/reports/contents.tpl:6
+#: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
 #: plugins/addons/logview/contents.tpl:47
-#: plugins/addons/mailqueue/contents.tpl:8
-#: plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/mailqueue/contents.tpl:12
+#: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Suche nach"
 
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+#: plugins/gofax/faxreports/contents.tpl:7
+#: plugins/gofon/fonreports/contents.tpl:7
 msgid "Enter user name to search for"
 msgstr "Benutzername, nach dem gesucht werden soll"
 
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+#: plugins/gofax/faxreports/contents.tpl:8
+#: plugins/gofax/faxreports/contents.tpl:16
+#: plugins/gofon/fonreports/contents.tpl:8
+#: plugins/gofon/fonreports/contents.tpl:16
 msgid "in"
 msgstr "in"
 
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+#: plugins/gofax/faxreports/contents.tpl:9
+#: plugins/gofon/fonreports/contents.tpl:9
 msgid "Select subtree to base search on"
 msgstr "Wählen Sie den Teilbaum, in dem gesucht werden soll"
 
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+#: plugins/gofax/faxreports/contents.tpl:12
+#: plugins/gofon/fonreports/contents.tpl:12
 msgid "during"
 msgstr "während"
 
-#: plugins/gofax/reports/contents.tpl:31
+#: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
+#: plugins/gofon/fonreports/contents.tpl:30
 msgid "Date"
 msgstr "Datum"
 
-#: plugins/gofax/reports/contents.tpl:33
-#: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/gofax/faxreports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:58
 msgid "Sender"
 msgstr "Absender"
 
-#: plugins/gofax/reports/contents.tpl:34
+#: plugins/gofax/faxreports/contents.tpl:34
 msgid "Receiver"
 msgstr "Empfänger"
 
-#: plugins/gofax/reports/contents.tpl:47
+#: plugins/gofax/faxreports/contents.tpl:50
 #: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
+#: plugins/gofon/fonreports/contents.tpl:51
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
-#: plugins/gofax/reports/class_faxreport.inc:6
+#: plugins/gofax/faxreports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
-#: plugins/gofax/reports/class_faxreport.inc:100
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:106
-#: plugins/gofax/reports/class_faxreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
 "angezeigt werden!"
 
-#: plugins/gofax/reports/class_faxreport.inc:110
-#: plugins/gofax/reports/class_faxreport.inc:222
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
+"Setup."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
 msgid "Can't select fax database for report generation!"
 msgstr ""
 "Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
 "werden!"
 
-#: plugins/gofax/reports/class_faxreport.inc:118
-#: plugins/gofax/reports/class_faxreport.inc:230
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:185
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:146
-#: plugins/gofax/reports/class_faxreport.inc:238
-#: plugins/gofon/reports/class_fonreport.inc:170
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/gofax/reports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:5
 msgid "FAX reports"
 msgstr "Fax-Berichte"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:40
+#: plugins/addons/addressbook/address_edit.tpl:66
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privat"
@@ -5431,10 +5477,10 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:362
-#: plugins/addons/addressbook/class_addressbook.inc:369
-#: plugins/addons/addressbook/class_addressbook.inc:373
-#: plugins/addons/addressbook/class_addressbook.inc:457
+#: plugins/addons/addressbook/class_addressbook.inc:361
+#: plugins/addons/addressbook/class_addressbook.inc:368
+#: plugins/addons/addressbook/class_addressbook.inc:372
+#: plugins/addons/addressbook/class_addressbook.inc:455
 msgid "Dial"
 msgstr "Wähle"
 
@@ -5442,27 +5488,27 @@ msgstr "W
 msgid "Choose the department to store entry in"
 msgstr "Wählen Sie die Abteilung, in der der Eintrag abgelegt werden soll"
 
-#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_edit.tpl:24
 #: plugins/addons/addressbook/address_info.tpl:12
 msgid "Personal"
 msgstr "Persönlich"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_edit.tpl:105
 #: plugins/addons/addressbook/address_info.tpl:43
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_edit.tpl:119
 #: plugins/addons/addressbook/address_info.tpl:53
 msgid "Organizational"
 msgstr "Organisationsbezogen"
 
-#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:128
 #: plugins/addons/addressbook/address_info.tpl:61
 msgid "Company"
 msgstr "Firma"
 
-#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
 msgid "Country"
 msgstr "Land"
@@ -5485,12 +5531,12 @@ msgstr "Adressbuch"
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:152
+#: plugins/addons/addressbook/class_addressbook.inc:154
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:156
+#: plugins/addons/addressbook/class_addressbook.inc:158
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -5498,66 +5544,67 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:185
-#: plugins/addons/addressbook/class_addressbook.inc:289
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:283
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Sie löschen gerade den Eintrag %s."
 
-#: plugins/addons/addressbook/class_addressbook.inc:379
+#: plugins/addons/addressbook/class_addressbook.inc:378
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:383
+#: plugins/addons/addressbook/class_addressbook.inc:382
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
+#: plugins/addons/addressbook/class_addressbook.inc:467
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:470
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:476
+#: plugins/addons/addressbook/class_addressbook.inc:474
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:478
+#: plugins/addons/addressbook/class_addressbook.inc:476
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/addons/logview/class_logview.inc:67
-#: plugins/addons/logview/class_logview.inc:81
-#: plugins/addons/mailqueue/class_mailqueue.inc:153
+#: plugins/addons/addressbook/class_addressbook.inc:515
+#: plugins/addons/logview/class_logview.inc:94
+#: plugins/addons/logview/class_logview.inc:111
+#: plugins/addons/mailqueue/class_mailqueue.inc:281
+#: plugins/addons/mailqueue/class_mailqueue.inc:346
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:508
+#: plugins/addons/addressbook/class_addressbook.inc:516
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:508
+#: plugins/addons/addressbook/class_addressbook.inc:516
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:581
+#: plugins/addons/addressbook/class_addressbook.inc:598
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "bitte weitere Felder aus."
 
-#: plugins/addons/addressbook/class_addressbook.inc:593
+#: plugins/addons/addressbook/class_addressbook.inc:606
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -5569,51 +5616,51 @@ msgstr ""
 msgid "LDIF export"
 msgstr "LDIF exportieren"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:96
+#: plugins/addons/ldapmanager/class_csvimport.inc:101
 msgid "You've no permission to do CSV imports."
 msgstr "Sie haben keine Berechtigung, um CSV Daten zu importieren."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:157
+#: plugins/addons/ldapmanager/class_csvimport.inc:161
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "Benötige 'Name', 'Vorname' und 'Kennung'' um den Benutzer anzulegen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:203
+#: plugins/addons/ldapmanager/class_csvimport.inc:209
 msgid "failed"
 msgstr "Fehlgeschlagen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:207
+#: plugins/addons/ldapmanager/class_csvimport.inc:213
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:264
+#: plugins/addons/ldapmanager/class_csvimport.inc:277
 msgid "status"
 msgstr "Status"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:268
+#: plugins/addons/ldapmanager/class_csvimport.inc:281
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Ein Fehler trat während des Einfügens des Eintrags %s auf - Vorgang "
 "abgebrochen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:293
+#: plugins/addons/ldapmanager/class_csvimport.inc:319
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:305
-#: plugins/addons/ldapmanager/class_csvimport.inc:316
-#: plugins/addons/ldapmanager/class_csvimport.inc:321
+#: plugins/addons/ldapmanager/class_csvimport.inc:331
+#: plugins/addons/ldapmanager/class_csvimport.inc:342
+#: plugins/addons/ldapmanager/class_csvimport.inc:347
 #: plugins/addons/ldapmanager/class_import.inc:62
 #: plugins/addons/ldapmanager/class_import.inc:70
 msgid "There is no file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
+#: plugins/addons/ldapmanager/class_csvimport.inc:336
 #: plugins/addons/ldapmanager/class_import.inc:55
 msgid "The specified file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:449
+#: plugins/addons/ldapmanager/class_csvimport.inc:490
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Die gewählte Datei enthält keine CSV Daten..."
 
@@ -5675,10 +5722,11 @@ msgid "Oups. There was an error during the import of your data."
 msgstr "Es gab einen Fehler während des Importvorgangs Ihrer Daten."
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:39
+#, fuzzy
 msgid "Here is the status report for the import:"
-msgstr "Hier ist der Statusreport vom Import:"
+msgstr "Statusreport des Imports"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
+#: plugins/addons/ldapmanager/contentcsv.tpl:80
 msgid "Selected Template"
 msgstr "Gewählte Vorlage"
 
@@ -5741,18 +5789,18 @@ msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
 msgid "LDAP manager"
 msgstr "LDAP-Manager"
 
-#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "CSV-Import"
 
 #: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:39
 msgid "You've no permission to do LDAP exports."
 msgstr ""
 "Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
 
 #: plugins/addons/ldapmanager/class_export.inc:83
-#: plugins/addons/ldapmanager/class_exportxls.inc:88
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
 msgid "Error while exporting the requested entries!"
 msgstr "Fehler beim Export der angeforderten Einträge!"
 
@@ -5791,67 +5839,61 @@ msgstr "XLS-Import"
 msgid "System logs"
 msgstr "Systemprotokolle"
 
-#: plugins/addons/logview/class_logview.inc:36
+#: plugins/addons/logview/class_logview.inc:63
 msgid "No LOG servers defined!"
 msgstr "Keine LOG-Server definiert!"
 
-#: plugins/addons/logview/class_logview.inc:52
-#: plugins/addons/logview/class_logview.inc:152
-msgid "Can't select log database for log generation!"
+#: plugins/addons/logview/class_logview.inc:73
+#: plugins/addons/logview/class_logview.inc:168
+msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
-"Die LOG-Datenbank kann bezüglich der Protokollgenerierung nicht ausgewählt "
+"Die LOG-Datenbank kann nicht erreicht werden. Es können keine Protokolle "
+"angezeigt werden!"
+
+#: plugins/addons/logview/class_logview.inc:77
+#: plugins/addons/logview/class_logview.inc:171
+msgid "Can't select log database for log generation!"
+msgstr ""
+"Die LOG-Datenbank kann bezüglich der Protokollgenerierung nicht ausgewählt "
 "werden!"
 
-#: plugins/addons/logview/class_logview.inc:61
-#: plugins/addons/logview/class_logview.inc:75
-#: plugins/addons/logview/class_logview.inc:224
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:103
 msgid "Query for log database failed!"
 msgstr "Die Anfrage zur LOG-Datenbank ist fehlgeschlagen!"
 
-#: plugins/addons/logview/class_logview.inc:85
+#: plugins/addons/logview/class_logview.inc:118
 msgid "one hour"
 msgstr "eine Stunde"
 
-#: plugins/addons/logview/class_logview.inc:85
+#: plugins/addons/logview/class_logview.inc:118
 msgid "6 hours"
 msgstr "6 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:119
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:119
 msgid "24 hours"
 msgstr "24 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:120
 msgid "2 days"
 msgstr "2 Tage"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:120
 msgid "one week"
 msgstr "eine Woche"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:121
 msgid "2 weeks"
 msgstr "2 Wochen"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:121
 msgid "one month"
 msgstr "ein Monat"
 
-#: plugins/addons/logview/class_logview.inc:102
-msgid ""
-"There is no mysql extension available in your php setup, can't perform any "
-"query."
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:149
-msgid "Can't connect to log database, no logs can be shown!"
-msgstr ""
-"Die LOG-Datenbank kann nicht erreicht werden. Es können keine Protokolle "
-"angezeigt werden!"
-
 #: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
 msgstr "Zeige Rechner"
@@ -5893,7 +5935,7 @@ msgstr "Systemprotokolle"
 msgid "Mail queue"
 msgstr "Mail-Warteschlange"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:46
+#: plugins/addons/mailqueue/class_mailqueue.inc:53
 msgid ""
 "Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
 "specified."
@@ -5901,99 +5943,193 @@ msgstr ""
 "Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag "
 "'MAILQUEUE_QUERY_COMMAND' wurde nicht gefunden."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:68
-#: plugins/addons/mailqueue/class_mailqueue.inc:87
+#: plugins/addons/mailqueue/class_mailqueue.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:88
+#: plugins/addons/mailqueue/class_mailqueue.inc:107
+#: plugins/addons/mailqueue/class_mailqueue.inc:116
+#: plugins/addons/mailqueue/class_mailqueue.inc:171
+#: plugins/addons/mailqueue/class_mailqueue.inc:198
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 "Bitte überprüfen Sie Ihre 'gosa.conf' - '%s' kann nicht ausgeführt werden."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:127
+#: plugins/addons/mailqueue/class_mailqueue.inc:251
 msgid "up"
 msgstr "auf"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:129
+#: plugins/addons/mailqueue/class_mailqueue.inc:253
 msgid "down"
 msgstr "ab"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:167
+#: plugins/addons/mailqueue/class_mailqueue.inc:296
 msgid "no limit"
 msgstr "keine Beschränkung"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:172
+#: plugins/addons/mailqueue/class_mailqueue.inc:301
 msgid "hours"
 msgstr "Stunden"
 
-#: plugins/addons/mailqueue/contents.tpl:9
+#: plugins/addons/mailqueue/class_mailqueue.inc:347
+msgid "Hold"
+msgstr "Vorhalten"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:348
+msgid "Un hold"
+msgstr "Vorhalten aufheben"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:349
+#: plugins/addons/mailqueue/contents.tpl:78
+msgid "Active"
+msgstr "Aktiv"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:350
+msgid "Not active"
+msgstr "inaktiv"
+
+#: plugins/addons/mailqueue/contents.tpl:13
 msgid "Please enter a search string here."
 msgstr "Bitte geben Sie einen Such-String ein."
 
-#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:15
 msgid "Select a server"
 msgstr "Wählen Sie einen Server"
 
-#: plugins/addons/mailqueue/contents.tpl:14
+#: plugins/addons/mailqueue/contents.tpl:18
+msgid "with status"
+msgstr "mit Status"
+
+#: plugins/addons/mailqueue/contents.tpl:22
 msgid "within the last"
 msgstr "innerhalb der letzten"
 
-#: plugins/addons/mailqueue/contents.tpl:25
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Remove all messages"
+msgstr "Entferne alle Nachrichten"
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Remove all messages from selected servers queue"
+msgstr "Entferne alle Nachrichten aus der Warteschlange des gewählten Servers"
+
+#: plugins/addons/mailqueue/contents.tpl:32
+msgid "Hold all messages"
+msgstr "Alle Nachrichten vorhalten"
+
+#: plugins/addons/mailqueue/contents.tpl:33
+msgid "Hold all messages in selected servers queue"
+msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers vorhalten"
+
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Release all messages"
+msgstr "Alle Nachrichten freigeben"
+
+#: plugins/addons/mailqueue/contents.tpl:35
+msgid "Release all messages in selected servers queue"
+msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers freigeben"
+
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Requeue all messages"
+msgstr "Alle Nachrichten wieder einreihen"
+
+#: plugins/addons/mailqueue/contents.tpl:37
+msgid "Requeue all messages in selected servers queue"
+msgstr ""
+"Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
+
+#: plugins/addons/mailqueue/contents.tpl:48
 msgid "Search returned no results"
 msgstr "Die Suche verlief ergebnislos..."
 
-#: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/contents.tpl:54
 msgid "ID"
 msgstr "ID"
 
-#: plugins/addons/mailqueue/contents.tpl:34
+#: plugins/addons/mailqueue/contents.tpl:57
 msgid "Arrival"
 msgstr "Ankunft"
 
-#: plugins/addons/mailqueue/contents.tpl:36
+#: plugins/addons/mailqueue/contents.tpl:59
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: plugins/addons/mailqueue/contents.tpl:37
+#: plugins/addons/mailqueue/contents.tpl:60
 msgid "Error"
 msgstr "Fehler"
 
+#: plugins/addons/mailqueue/contents.tpl:95
+msgid "Delete this message"
+msgstr "Diese Nachricht entfernen"
+
+#: plugins/addons/mailqueue/contents.tpl:99
+msgid "unhold"
+msgstr "Vorhalten aufheben"
+
+#: plugins/addons/mailqueue/contents.tpl:99
+msgid "Release message"
+msgstr "Nachricht freigeben"
+
+#: plugins/addons/mailqueue/contents.tpl:103
+msgid "hold"
+msgstr "vorhalten"
+
+#: plugins/addons/mailqueue/contents.tpl:103
+msgid "Hold message"
+msgstr "Nachricht vorhalten"
+
+#: plugins/addons/mailqueue/contents.tpl:107
+msgid "requeue"
+msgstr "wieder einreihen"
+
+#: plugins/addons/mailqueue/contents.tpl:107
+msgid "Requeue this message"
+msgstr "Diese Nachricht wieder einreihen"
+
+#: plugins/addons/mailqueue/contents.tpl:110
+msgid "header"
+msgstr "Kopfzeilen"
+
+#: plugins/addons/mailqueue/contents.tpl:110
+msgid "Display header from this message"
+msgstr "Zeige Kopfzeilen dieser Nachricht"
+
 #: plugins/admin/groups/class_groupGeneric.inc:115
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Die SID dieser Gruppe kann weder im LDAP noch in der Konfigurationsdatei "
 "gefunden werden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:167
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:282
+#: plugins/admin/groups/class_groupGeneric.inc:285
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:287
+#: plugins/admin/groups/class_groupGeneric.inc:290
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:621
-#: plugins/admin/ogroups/class_ogroup.inc:526
+#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/ogroups/class_ogroup.inc:531
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:636
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -6001,8 +6137,8 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:642
-#: plugins/admin/groups/class_groupGeneric.inc:649
+#: plugins/admin/groups/class_groupGeneric.inc:647
+#: plugins/admin/groups/class_groupGeneric.inc:654
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
@@ -6048,68 +6184,68 @@ msgstr ""
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
-#: plugins/admin/groups/class_groupManagement.inc:276
+#: plugins/admin/groups/class_groupManagement.inc:275
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
 
-#: plugins/admin/groups/class_groupManagement.inc:282
-#: plugins/admin/groups/class_groupManagement.inc:308
+#: plugins/admin/groups/class_groupManagement.inc:281
+#: plugins/admin/groups/class_groupManagement.inc:307
 msgid "You are not allowed to delete this group!"
 msgstr "Sie haben keine Berechtigung, diese Gruppe zu löschen!"
 
-#: plugins/admin/groups/class_groupManagement.inc:356
+#: plugins/admin/groups/class_groupManagement.inc:354
 msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
-#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:361
 #: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:294
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:291
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:362
 #: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:295
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:727
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:378
+#: plugins/admin/groups/class_groupManagement.inc:375
 #: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
-#: plugins/gofon/reports/contents.tpl:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupManagement.inc:388
+#: plugins/admin/groups/class_groupManagement.inc:385
 msgid "Groupname"
 msgstr "Name der Gruppe"
 
-#: plugins/admin/groups/class_groupManagement.inc:389
-#: plugins/admin/users/class_userManagement.inc:690
+#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/users/class_userManagement.inc:691
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:393
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: plugins/admin/groups/class_groupManagement.inc:394
+#: plugins/admin/groups/class_groupManagement.inc:390
 #: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/ogroups/class_ogroupManagement.inc:398
+#: plugins/admin/ogroups/class_ogroupManagement.inc:397
 msgid "This table displays all groups, in the selected tree."
 msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
 
@@ -6125,52 +6261,52 @@ msgstr ""
 msgid "Application options"
 msgstr "Anwendungsoptionen"
 
-#: plugins/admin/groups/class_groupMail.inc:153
+#: plugins/admin/groups/class_groupMail.inc:158
 msgid "read"
 msgstr "lesen"
 
-#: plugins/admin/groups/class_groupMail.inc:154
+#: plugins/admin/groups/class_groupMail.inc:159
 msgid "post"
 msgstr "posten"
 
-#: plugins/admin/groups/class_groupMail.inc:155
+#: plugins/admin/groups/class_groupMail.inc:160
 msgid "external post"
 msgstr "extern posten"
 
-#: plugins/admin/groups/class_groupMail.inc:156
+#: plugins/admin/groups/class_groupMail.inc:161
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:157
+#: plugins/admin/groups/class_groupMail.inc:162
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/groups/class_groupMail.inc:182
+#: plugins/admin/groups/class_groupMail.inc:187
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Dieser 'DN' hat keine Mail-Erweiterungen."
 
-#: plugins/admin/groups/class_groupMail.inc:247
+#: plugins/admin/groups/class_groupMail.inc:252
 msgid "You're trying to add an invalid email address "
 msgstr "Sie versuchen, eine ungültige Mail-Adresse hinzuzufügen"
 
-#: plugins/admin/groups/class_groupMail.inc:248
+#: plugins/admin/groups/class_groupMail.inc:253
 msgid "to the list of forwarders."
 msgstr "zur Liste der Weiterleitungen hinzuzufügen."
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:622
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/admin/groups/class_groupMail.inc:650
+#: plugins/admin/groups/class_groupMail.inc:655
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Bitte wählen sie gültige Zugriffsrechte. Standard-Zugriffsrechte dürfen "
 "nicht leer sein."
 
-#: plugins/admin/groups/class_groupMail.inc:654
+#: plugins/admin/groups/class_groupMail.inc:659
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
@@ -6190,7 +6326,11 @@ msgstr "Anwenden dieser Zugriffsregel nur auf Eintr
 msgid "Used applications"
 msgstr "Verwendete Anwendungen"
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:6
+msgid "Seperator"
+msgstr "Feldtrenner"
+
+#: plugins/admin/groups/application.tpl:11
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
@@ -6280,15 +6420,15 @@ msgstr "Zeige die Adressen der Abteilung"
 msgid "Display addresses matching"
 msgstr "Zeige die Adressen, auf die das Folgende passt"
 
-#: plugins/admin/groups/class_groupApplication.inc:153
+#: plugins/admin/groups/class_groupApplication.inc:202
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
 
-#: plugins/admin/groups/class_groupApplication.inc:161
+#: plugins/admin/groups/class_groupApplication.inc:210
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:162
+#: plugins/admin/groups/class_groupApplication.inc:211
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6296,11 +6436,11 @@ msgstr ""
 "Diese Gruppe hat Anwendungs-Eigenschaften aktiviert. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/groups/class_groupApplication.inc:164
+#: plugins/admin/groups/class_groupApplication.inc:213
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:165
+#: plugins/admin/groups/class_groupApplication.inc:214
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6308,28 +6448,27 @@ msgstr ""
 "Diese Gruppe besitzt deaktivierte Anwendungs-Eigenschaften. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/groups/class_groupApplication.inc:184
+#: plugins/admin/groups/class_groupApplication.inc:242
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Der gewählte Anwendungsname ist nicht eindeutig. Bitte überprüfen Sie Ihr "
 "LDAP-Verzeichnis."
 
-#: plugins/admin/groups/class_groupApplication.inc:220
+#: plugins/admin/groups/class_groupApplication.inc:278
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
-#: plugins/admin/groups/class_groupApplication.inc:313
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/fai/class_faiManagement.inc:501
+#: plugins/admin/groups/class_groupApplication.inc:371
+#: plugins/admin/departments/class_departmentManagement.inc:315
+#: plugins/admin/fai/class_faiManagement.inc:503
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/groups/class_groupApplication.inc:321
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:379
 msgid "application"
-msgstr "Anwendungen"
+msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupApplication.inc:514
+#: plugins/admin/groups/class_groupApplication.inc:595
 #: plugins/admin/applications/class_applicationGeneric.inc:38
 msgid ""
 "There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
@@ -6337,8 +6476,8 @@ msgstr ""
 "Die Einstellung 'KDE_APPLICATIONS_MENU' ist nicht in ihrer gosa.conf "
 "vorhanden."
 
-#: plugins/admin/groups/class_groupApplication.inc:522
-#: plugins/admin/groups/class_groupApplication.inc:525
+#: plugins/admin/groups/class_groupApplication.inc:603
+#: plugins/admin/groups/class_groupApplication.inc:606
 #: plugins/admin/applications/class_applicationGeneric.inc:46
 #: plugins/admin/applications/class_applicationGeneric.inc:49
 #, php-format
@@ -6374,8 +6513,8 @@ msgstr ""
 "ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:1019
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:1028
+#: plugins/admin/systems/class_systemManagement.inc:705
 msgid "Template"
 msgstr "Vorlage"
 
@@ -6400,84 +6539,84 @@ msgstr "Sie haben keine Berechtigung, diesen Benutzer zu l
 
 #: plugins/admin/users/class_userManagement.inc:488
 #: plugins/admin/systems/class_workstationStartup.inc:49
-#: plugins/admin/ogroups/class_ogroup.inc:235
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:558
+#: plugins/admin/users/class_userManagement.inc:559
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/users/class_userManagement.inc:695
 msgid "This table displays all users, in the selected tree."
 msgstr "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:727
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:731
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:732
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:734
+#: plugins/admin/users/class_userManagement.inc:735
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/users/class_userManagement.inc:737
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:740
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:740
+#: plugins/admin/users/class_userManagement.inc:741
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:800
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/users/class_userManagement.inc:807
 msgid "Offline"
 msgstr "inaktiv"
 
@@ -6635,20 +6774,20 @@ msgstr ""
 "Diese Anwendung besitzt keine Optionen. Sie können diese durch Betätigen der "
 "Schaltfläche unten hinzufügen."
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:91
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:91
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Standardwert"
 
-#: plugins/admin/applications/class_applicationParameters.inc:101
+#: plugins/admin/applications/class_applicationParameters.inc:102
 msgid "Add option"
 msgstr "Option hinzufügen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:152
+#: plugins/admin/applications/class_applicationParameters.inc:154
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
@@ -6700,7 +6839,7 @@ msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
 #: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "new"
 msgstr "Neu"
 
@@ -6708,38 +6847,38 @@ msgstr "Neu"
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:102
+#: plugins/admin/applications/class_applicationGeneric.inc:106
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:123
+#: plugins/admin/applications/class_applicationGeneric.inc:126
 msgid "This 'dn' is no application."
 msgstr "Dieser 'DN' ist keine Anwendung."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:238
+#: plugins/admin/applications/class_applicationGeneric.inc:241
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:319
+#: plugins/admin/applications/class_applicationGeneric.inc:322
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Anwendung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:324
+#: plugins/admin/applications/class_applicationGeneric.inc:327
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:328
+#: plugins/admin/applications/class_applicationGeneric.inc:331
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:332
+#: plugins/admin/applications/class_applicationGeneric.inc:335
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:341
+#: plugins/admin/applications/class_applicationGeneric.inc:344
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
@@ -6849,63 +6988,63 @@ msgstr "Abteilungsverwaltung"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:188
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:178
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:205
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:202
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:282
-#: plugins/admin/fai/class_faiManagement.inc:432
+#: plugins/admin/departments/class_departmentManagement.inc:279
+#: plugins/admin/fai/class_faiManagement.inc:434
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
-#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/departments/class_departmentManagement.inc:281
 msgid "Create new department"
 msgstr "Neue Abteilung erstellen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/departments/class_departmentManagement.inc:289
 msgid "This table displays all departments, in the selected tree."
 msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
 
-#: plugins/admin/departments/class_departmentManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_departmentManagement.inc:395
+#: plugins/admin/departments/class_departmentManagement.inc:392
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:143
+#: plugins/admin/departments/class_departmentGeneric.inc:150
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-#: plugins/admin/departments/class_departmentGeneric.inc:152
+#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/admin/departments/class_departmentGeneric.inc:159
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:160
+#: plugins/admin/departments/class_departmentGeneric.inc:167
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:165
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr "Das Feld 'Name' enthält das reservierte Wort 'incoming'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/admin/departments/class_departmentGeneric.inc:173
 msgid " Please choose another name."
 msgstr "Bitte wählen Sie einen anderen Namen."
 
@@ -6985,8 +7124,8 @@ msgstr ""
 #: plugins/admin/systems/class_winGeneric.inc:166
 #: plugins/admin/systems/class_terminalGeneric.inc:260
 #: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:214
-#: plugins/admin/systems/class_printGeneric.inc:456
+#: plugins/admin/systems/class_workstationGeneric.inc:221
+#: plugins/admin/systems/class_printGeneric.inc:458
 #: plugins/admin/systems/class_componentGeneric.inc:136
 #: plugins/admin/systems/class_phoneGeneric.inc:302
 #, php-format
@@ -7316,7 +7455,7 @@ msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 #: plugins/admin/systems/class_servGeneric.inc:66
 #: plugins/admin/systems/class_servGeneric.inc:78
 #: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:101
+#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/ogroups/class_termgroup.inc:66
 #: plugins/admin/ogroups/class_termgroup.inc:78
 #: plugins/admin/ogroups/class_termgroup.inc:90
@@ -7338,21 +7477,21 @@ msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:147
 #: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Switch off"
 msgstr "Ausschalten"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:147
 #: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Reboot"
 msgstr "Neustarten"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:149
 #: plugins/admin/systems/class_servGeneric.inc:117
-#: plugins/admin/systems/class_workstationGeneric.inc:131
+#: plugins/admin/systems/class_workstationGeneric.inc:137
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr "Aufwecken"
@@ -7455,46 +7594,55 @@ msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 msgid "Admins"
 msgstr "Administratoren"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:68
+#: plugins/admin/systems/class_workstationGeneric.inc:70
 msgid "Activated"
 msgstr "Aktiv"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:69
+#: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
+#: plugins/admin/systems/class_workstationGeneric.inc:72
 msgid "Memory test"
 msgstr "Speichertest"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:97
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Systemanalyse"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:100
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/systems/class_workstationGeneric.inc:114
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:127
+#: plugins/admin/systems/class_workstationGeneric.inc:132
 msgid "Instant update"
 msgstr "Sofortiges Update"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:128
-#: plugins/admin/systems/class_workstationGeneric.inc:132
+#: plugins/admin/systems/class_workstationGeneric.inc:133
+#: plugins/admin/systems/class_workstationGeneric.inc:139
 msgid "Scheduled update"
 msgstr "Geplantes Update"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:129
+#: plugins/admin/systems/class_workstationGeneric.inc:134
+#: plugins/admin/systems/class_workstationGeneric.inc:138
+msgid "Reinstall"
+msgstr "Neu-Installation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:135
 msgid "Rescan hardware"
 msgstr "Hardware neu erkennen"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:204
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:208
 msgid "The required field 'Workstation name' is not set."
 msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 
@@ -7525,8 +7673,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_systemManagement.inc:413
 #: plugins/admin/systems/class_systemManagement.inc:477
-#: plugins/admin/fai/class_faiManagement.inc:211
-#: plugins/admin/fai/class_faiManagement.inc:250
+#: plugins/admin/fai/class_faiManagement.inc:210
+#: plugins/admin/fai/class_faiManagement.inc:249
 msgid "You are not allowed to delete this component!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
@@ -7535,7 +7683,7 @@ msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
 #: plugins/admin/systems/class_systemManagement.inc:569
-#: plugins/admin/systems/class_systemManagement.inc:711
+#: plugins/admin/systems/class_systemManagement.inc:710
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
@@ -7544,7 +7692,7 @@ msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
 #: plugins/admin/systems/class_systemManagement.inc:570
-#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/systems/class_systemManagement.inc:711
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
@@ -7576,87 +7724,87 @@ msgstr "Entferne System"
 msgid "System"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:593
-#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:473
 msgid "This table displays all systems, in the selected tree."
 msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:625
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:627
+#: plugins/admin/systems/class_systemManagement.inc:626
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:628
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:629
+#: plugins/admin/systems/class_systemManagement.inc:628
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:630
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:631
+#: plugins/admin/systems/class_systemManagement.inc:630
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:632
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:633
+#: plugins/admin/systems/class_systemManagement.inc:632
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:634
+#: plugins/admin/systems/class_systemManagement.inc:633
 msgid "Fax Server"
 msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/class_systemManagement.inc:634
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:660
 msgid "Set root password"
 msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/ogroups/class_ogroupManagement.inc:488
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:488
+#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:713
+#: plugins/admin/systems/class_systemManagement.inc:712
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:714
+#: plugins/admin/systems/class_systemManagement.inc:713
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:930
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:933
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:951
+#: plugins/admin/systems/class_systemManagement.inc:950
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:963
+#: plugins/admin/systems/class_systemManagement.inc:962
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
@@ -7718,36 +7866,36 @@ msgstr ""
 msgid "This 'dn' has no printer features."
 msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/class_printGeneric.inc:362
+#: plugins/admin/systems/class_printGeneric.inc:364
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: plugins/admin/systems/class_printGeneric.inc:370
+#: plugins/admin/systems/class_printGeneric.inc:372
 msgid "can't get ppd informations."
 msgstr "keine PPD-Informationen verfügbar"
 
-#: plugins/admin/systems/class_printGeneric.inc:382
+#: plugins/admin/systems/class_printGeneric.inc:384
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
 
-#: plugins/admin/systems/class_printGeneric.inc:384
+#: plugins/admin/systems/class_printGeneric.inc:386
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
 "möglich."
 
-#: plugins/admin/systems/class_printGeneric.inc:446
+#: plugins/admin/systems/class_printGeneric.inc:448
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_printGeneric.inc:582
 #: plugins/admin/systems/class_printGeneric.inc:584
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
@@ -8168,12 +8316,12 @@ msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "yes"
 msgstr "ja"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "no"
 msgstr "nein"
 
@@ -8442,19 +8590,24 @@ msgstr "Das Feld 'Pfad' enth
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
+#: plugins/admin/systems/servnfs.tpl:1
+#, fuzzy
+msgid "Edit share"
+msgstr "Benutzer bearbeiten"
+
 #: plugins/admin/systems/servnfs.tpl:2
 msgid "NFS setup"
 msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/servnfs.tpl:41
-msgid "Charset"
-msgstr "Zeichensatz"
-
-#: plugins/admin/systems/servnfs.tpl:63
+#: plugins/admin/systems/servnfs.tpl:25
 msgid "Path"
 msgstr "Pfad"
 
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Charset"
+msgstr "Zeichensatz"
+
+#: plugins/admin/systems/servnfs.tpl:59
 msgid "Option"
 msgstr "Option"
 
@@ -8551,9 +8704,8 @@ msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
 
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-#, fuzzy
 msgid "Printer ppd selection."
-msgstr "Drucker-Standort"
+msgstr "Auswahl der Drucker-PPD"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -8564,14 +8716,14 @@ msgstr "W
 #: 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
+#: plugins/admin/fai/faiPackageEntry.tpl:48
 msgid "Display objects matching"
 msgstr "Zeige die Objekte, auf die Folgendes passt"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:34
 #: 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
+#: plugins/admin/fai/faiPackageEntry.tpl:53
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Objekt-Namen"
 
@@ -8585,7 +8737,6 @@ msgstr ""
 "Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
 
 #: plugins/admin/systems/class_workstationStartup.inc:251
-#, fuzzy
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -8647,12 +8798,12 @@ msgstr "setzen"
 msgid "Assigned FAI classes"
 msgstr "Zugewiesene FAI-Klassen"
 
-#: plugins/admin/systems/workstationStartup.tpl:65
+#: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr "Kernel-Module (Format: Name Parameter)"
 
-#: plugins/admin/systems/workstationStartup.tpl:67
+#: plugins/admin/systems/workstationStartup.tpl:64
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
@@ -8817,59 +8968,59 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Wählen Sie die auszuführende Aktion für diese Gruppe von Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:127
+#: plugins/admin/ogroups/class_ogroup.inc:132
 msgid "This 'dn' is no object group."
 msgstr "Diese 'dn' ist keine Objektgruppenerweiterungen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:237
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:239
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/ogroups/class_ogroup.inc:245
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:241
+#: plugins/admin/ogroups/class_ogroup.inc:246
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:243
+#: plugins/admin/ogroups/class_ogroup.inc:248
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:245
+#: plugins/admin/ogroups/class_ogroup.inc:250
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:251
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:247
+#: plugins/admin/ogroups/class_ogroup.inc:252
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:254
+#: plugins/admin/ogroups/class_ogroup.inc:259
 msgid "and"
 msgstr "und"
 
-#: plugins/admin/ogroups/class_ogroup.inc:405
+#: plugins/admin/ogroups/class_ogroup.inc:410
 msgid "Non existing dn: "
 msgstr "Unbekannte dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:536
+#: plugins/admin/ogroups/class_ogroup.inc:541
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
@@ -8891,25 +9042,25 @@ msgstr "Thin Clients"
 msgid "Workstations"
 msgstr "Workstations"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:218
+#: plugins/admin/ogroups/class_ogroupManagement.inc:217
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:224
-#: plugins/admin/ogroups/class_ogroupManagement.inc:250
+#: plugins/admin/ogroups/class_ogroupManagement.inc:223
+#: plugins/admin/ogroups/class_ogroupManagement.inc:249
 msgid "You are not allowed to delete this object group!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "Create new object group"
 msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Name of object groups"
 msgstr "Name der Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:441
+#: plugins/admin/ogroups/class_ogroupManagement.inc:440
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Objektgruppe"
@@ -9045,35 +9196,35 @@ msgstr ""
 "Diese Gruppe besitzt keine gültigen Warteschlangen-Erweiterung. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:199
 msgid "Timeout must be numeric"
 msgstr "Der Wert für 'Wartezeit' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 msgid "Retry must be numeric"
 msgstr "Der Wert für 'Wiederholen' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Max queue length must be numeric"
 msgstr "Der Wert für 'Maximale Grösse der Warteschlange' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Announce frequency must be numeric"
 msgstr "Der Wert für 'Benachrichtigungsfrequenz' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:214
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:228
+#: plugins/admin/ogroups/class_phonequeue.inc:225
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Im Moment ist kein Asterisk-Server definiert. Ihre Einstellungen können "
 "nicht gespeichert werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:238
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -9082,41 +9233,41 @@ msgstr ""
 "MySQL-Server '%s' kann nicht als Benutzer '%s' erreicht werden, überprüfen "
 "Sie das GOsa Protokoll auf MySQL-Fehlermeldungen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:251
-#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/admin/ogroups/class_phonequeue.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:622
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#: plugins/gofon/macro/class_gofonMacro.inc:213
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:259
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:375
+#: plugins/gofon/macro/class_gofonMacro.inc:216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:282
-#: plugins/admin/ogroups/class_phonequeue.inc:496
-#: plugins/admin/ogroups/class_phonequeue.inc:661
+#: plugins/admin/ogroups/class_phonequeue.inc:279
+#: plugins/admin/ogroups/class_phonequeue.inc:493
+#: plugins/admin/ogroups/class_phonequeue.inc:658
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "Kann Datenbank '%s' auf Server '%s' nicht löschen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/admin/ogroups/class_phonequeue.inc:528
+#: plugins/admin/ogroups/class_phonequeue.inc:523
+#: plugins/admin/ogroups/class_phonequeue.inc:525
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:415
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:417
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/admin/ogroups/class_phonequeue.inc:612
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
-#: plugins/gofon/macro/class_gofonMacro.inc:202
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:364
+#: plugins/gofon/macro/class_gofonMacro.inc:205
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -9256,111 +9407,111 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/class_faiManagement.inc:32
+#: plugins/admin/fai/class_faiManagement.inc:31
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:32
 msgid "Fully Automatic Installation - management"
 msgstr "Verwaltung von FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:205
+#: plugins/admin/fai/class_faiManagement.inc:204
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:444
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:444
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:447
 msgid "New scripts"
 msgstr "Neue Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:447
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:450
 msgid "New hooks"
 msgstr "Neue Hooks"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:450
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:453
 msgid "New variables"
 msgstr "Neue Variablen"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:453
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:456
 msgid "New templates"
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:456
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:459
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:459
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:475
+#: plugins/admin/fai/class_faiManagement.inc:477
 msgid "Name of FAI class"
 msgstr "Name der FAI-Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:476
+#: plugins/admin/fai/class_faiManagement.inc:478
 msgid "Class type"
 msgstr "Typ der Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:480
+#: plugins/admin/fai/class_faiManagement.inc:482
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_faiManagement.inc:481
+#: plugins/admin/fai/class_faiManagement.inc:483
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/fai/class_faiManagement.inc:523
-#: plugins/admin/fai/class_faiManagement.inc:524
+#: plugins/admin/fai/class_faiManagement.inc:525
+#: plugins/admin/fai/class_faiManagement.inc:526
 #: plugins/admin/fai/class_faiProfile.inc:161
 #: plugins/admin/fai/class_faiProfileEntry.inc:123
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:530
-#: plugins/admin/fai/class_faiManagement.inc:531
+#: plugins/admin/fai/class_faiManagement.inc:532
+#: plugins/admin/fai/class_faiManagement.inc:533
 msgid "Package list"
 msgstr "Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:537
-#: plugins/admin/fai/class_faiManagement.inc:538
+#: plugins/admin/fai/class_faiManagement.inc:539
+#: plugins/admin/fai/class_faiManagement.inc:540
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:558
-#: plugins/admin/fai/class_faiManagement.inc:559
+#: plugins/admin/fai/class_faiManagement.inc:560
+#: plugins/admin/fai/class_faiManagement.inc:561
 msgid "Profile"
 msgstr "Profil"
 
@@ -9448,7 +9599,7 @@ msgstr "Die angebene Datei ist leer."
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:99
 #: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:104
+#: plugins/admin/fai/class_faiHookEntry.inc:112
 #: plugins/admin/fai/class_faiTemplateEntry.inc:164
 msgid "Please enter a name."
 msgstr "Bitte geben Sie eine Namen ein."
@@ -9471,25 +9622,29 @@ msgstr "W
 msgid "Import script"
 msgstr "Skript importieren"
 
-#: plugins/admin/fai/class_faiPackage.inc:123
+#: plugins/admin/fai/class_faiPackage.inc:150
 msgid "There is no useable package list defined."
 msgstr "Es wurde keine gebrauchsfähige Paketliste definiert."
 
-#: plugins/admin/fai/class_faiPackage.inc:261
+#: plugins/admin/fai/class_faiPackage.inc:295
 #, php-format
 msgid "Can't read configuration folder '%s'."
 msgstr "Kann das Konfigurationsverzeichnis '%s' nicht lesen."
 
-#: plugins/admin/fai/class_faiPackage.inc:343
+#: plugins/admin/fai/class_faiPackage.inc:377
 msgid "Please select a least one Package."
 msgstr "Bitte wählen Sie mindestens ein Paket."
 
-#: plugins/admin/fai/class_faiPackage.inc:347
+#: plugins/admin/fai/class_faiPackage.inc:381
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
 
-#: plugins/admin/fai/class_faiPackage.inc:378
+#: plugins/admin/fai/class_faiPackage.inc:402
+msgid "package is configured"
+msgstr "Paket ist konfiguriert"
+
+#: plugins/admin/fai/class_faiPackage.inc:426
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Paket '%s' existiert nicht."
@@ -9714,7 +9869,7 @@ msgstr "%s Partition"
 msgid "%s partition(s)"
 msgstr "%s Partition(en)"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:100
+#: plugins/admin/fai/class_faiHookEntry.inc:108
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
 
@@ -9870,7 +10025,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:316
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -9931,7 +10086,7 @@ msgstr "Diese Liste zeigt alle diesem Repository zugeordneten Paket-Namen."
 msgid "List of available packages"
 msgstr "Liste verfügbarer Pakete"
 
-#: plugins/admin/fai/faiPackageEntry.tpl:27
+#: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -9939,6 +10094,15 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Pakete auszuwählen und zur gegenwärtig "
 "bearbeiteten Paketliste hinzuzufügen."
 
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paket"
+
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Debconf-Information für Paket '%s'"
+
 #: plugins/admin/fai/faiPackageNew.tpl:2
 msgid "Repository settings"
 msgstr "Repository-Einstellungen"
@@ -9989,7 +10153,7 @@ msgstr "Sections f
 msgid "Matching mirrors"
 msgstr "Passende Mirrors"
 
-#: plugins/gofon/phoneaccount/main.inc:121
+#: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
@@ -10003,8 +10167,8 @@ msgstr "nicht definiert"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
-#: plugins/gofon/macro/class_gofonMacro.inc:94
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+#: plugins/gofon/macro/class_gofonMacro.inc:97
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -10020,6 +10184,8 @@ msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
+"der Asterisk-DB speichern."
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:559
 msgid "Error while performing query:"
@@ -10107,7 +10273,7 @@ msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:332
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -10140,52 +10306,12 @@ msgstr "Telefon-Makro"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefon-Berichte"
-
-#: plugins/gofon/reports/class_fonreport.inc:150
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Die Telefon-Datenbank kann nicht erreicht werden. Es können keine Berichte "
-"angezeigt werden!"
-
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"Die Telefon-Datenbank kann bezüglich der Berichterstellung nicht ausgewählt "
-"werden!"
-
-#: plugins/gofon/reports/class_fonreport.inc:163
-msgid "Query for phone database failed!"
-msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
-
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Quelle"
-
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Ziel"
-
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanal"
-
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Dauer"
-
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefon-Berichte"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:100
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:103
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
 msgid "This 'dn' is no phone macro."
 msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:156
+#: plugins/gofon/macro/class_gofonMacro.inc:159
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -10193,61 +10319,63 @@ msgstr ""
 "Dieses Makro ist in Benutzung. Um es zu entfernen, stellen Sie bitte "
 "zunächst sicher, dass niemand dieses Makro ausgewählt hat."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:188
+#: plugins/gofon/macro/class_gofonMacro.inc:191
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
 msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
+"der Asterisk-DB speichern."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:258
+#: plugins/gofon/macro/class_gofonMacro.inc:261
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr "Fehler beim Einlesen des Makros in Zeile %s"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:276
+#: plugins/gofon/macro/class_gofonMacro.inc:279
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr "Kann SELECT-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:285
-#: plugins/gofon/macro/class_gofonMacro.inc:293
+#: plugins/gofon/macro/class_gofonMacro.inc:288
+#: plugins/gofon/macro/class_gofonMacro.inc:296
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr "Kann DELETE-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:307
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr "Kann INSERT-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:350
+#: plugins/gofon/macro/class_gofonMacro.inc:357
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:355
+#: plugins/gofon/macro/class_gofonMacro.inc:362
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:359
+#: plugins/gofon/macro/class_gofonMacro.inc:366
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Die angegebene cn ist zu lang. Die mögliche Länge ist auf 20 Zeichen "
 "begrenzt."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:364
+#: plugins/gofon/macro/class_gofonMacro.inc:371
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:370
+#: plugins/gofon/macro/class_gofonMacro.inc:377
 msgid "Makro length must be lower than 100 lines"
 msgstr "Das Makro darf nicht länger als 100 Zeilen sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:375
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
@@ -10301,35 +10429,35 @@ msgstr "Regul
 msgid "Phone macro management"
 msgstr "Telefon-Makro-Verwaltung"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:242
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
 msgstr "Zeichenkette"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:243
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Combobox"
 msgstr "Auswahl-Gruppe"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:244
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 msgid "Bool"
 msgstr "Schalter"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:250
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:337
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr "Der Parameter %s besitzt einen ungültigen Wert für Datentyp bool."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:366
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -10342,37 +10470,37 @@ msgstr ""
 msgid "Phone macros"
 msgstr "Telefon-Makros"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:251
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Sie sind dabei das Makro '%s' zu löschen."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:282
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:346
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
 msgid "This table displays all phone macros, in the selected tree."
 msgstr "Diese Tabelle enthält alle Telefon-Markos des gewählten Unterbaumes."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "invisible"
 msgstr "unsichtbar"
 
@@ -10406,7 +10534,7 @@ msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:317
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "PIN"
 msgstr "PIN"
 
@@ -10442,23 +10570,23 @@ msgstr "Telefon-Konferenzen"
 msgid "Management"
 msgstr "Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 msgid "This table displays all available conference rooms."
 msgstr "Diese Tabelle enthält alle verfügbaren Konferenzräume."
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
 msgid "Name - Number"
 msgstr "Name - Nummer"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:371
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
 msgid "Conference"
 msgstr "Konferenz"
 
@@ -10480,7 +10608,7 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:193
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -10488,33 +10616,78 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:197
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
 msgid "Please enter a PIN."
 msgstr "Bitte geben Sie eine PIN ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:201
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
 msgid "Please enter a name for the conference."
 msgstr "Bitte geben Sie einen Namen für die Konferenz ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:205
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Der Wert für 'Nummer' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:209
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Der Wert für 'Lebenszeit' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:349
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
 msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
+"der Asterisk-DB speichern."
 
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 msgid "Conference management"
 msgstr "Konferenz-Verwaltung"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefon-Berichte"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+#, fuzzy
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"angezeigt werden!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+#, fuzzy
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
+"werden!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Quelle"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Ziel"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Dauer"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefon-Berichte"
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -10558,14 +10731,65 @@ msgstr "Das GOsa Team"
 msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
-#~ msgid "Edit parameters"
-#~ msgstr "Parameter bearbeiten"
+#~ msgid ""
+#~ "There is no fax database defined in your config. Can't query anything."
+#~ msgstr ""
+#~ "Es ist keine FAX-Datenbank definiert. Kann keine Datenbankabfrage "
+#~ "durchführen."
 
-#~ msgid "Edit optional application parameters"
-#~ msgstr "Optionale Anwendungsparameter bearbeiten"
+#~ msgid ""
+#~ "Can't connect to fax database, no reports can be shown!. Check username, "
+#~ "password and server settings."
+#~ msgstr ""
+#~ "Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+#~ "angezeigt werden! Prüfen Sie die Passwort und Server-Einstellungen."
+
+#~ msgid "No mysql extension loaded, can't connect to mysql server."
+#~ msgstr ""
+#~ "Es ist keine MySQL-Erweiterung verfügbar, kann nicht zum Server verbinden."
 
 #~ msgid ""
-#~ "The application named %s is no longer available and has been removed."
+#~ "Can't connect to mysql server, please check username, password and server "
+#~ "settings."
 #~ msgstr ""
-#~ "Die Applikation mit dem Namen %s ist nicht mehr verfügbar und wurde aus "
-#~ "der Liste entfernt."
+#~ "Kann nicht  zum MySQL-Server verbinden, bitte prüfen Sie die Anmeldedaten."
+
+#~ msgid "Account expiry"
+#~ msgstr "Konto läuft ab am"
+
+#~ msgid "Can change password"
+#~ msgstr "Kann das Passwort ändern"
+
+#~ msgid "Password expiry"
+#~ msgstr "Passwort läuft ab am"
+
+#~ msgid "Home path"
+#~ msgstr "Pfad zum Home-Verzeichnis"
+
+#~ msgid "Home drive"
+#~ msgstr "Home-Laufwerk"
+
+#~ msgid "Samba domain name"
+#~ msgstr "Samba Domänen-Name"
+
+#~ msgid "Allow password change"
+#~ msgstr "Passwortänderung erlauben"
+
+#~ msgid "Lock account"
+#~ msgstr "Account sperren"
+
+#~ msgid ""
+#~ "Can't connect to phone database, no reports can be shown!. Check server,"
+#~ "username and password combination."
+#~ msgstr ""
+#~ "Die Telefon-Datenbank kann nicht erreicht werden. Es können keine "
+#~ "Berichte angezeigt werden!"
+
+#~ msgid "Can't select phone (gophone) database for report generation!"
+#~ msgstr ""
+#~ "Die Telefon-Datenbank kann bezüglich der Berichterstellung nicht "
+#~ "ausgewählt werden!"
+
+#, fuzzy
+#~ msgid "Enter         SSL         session"
+#~ msgstr "SSL Sitzung"