Locale cleanup

[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 f95bf525f8bbcb0b60c1f2309d9ae005c1077f2e..5ee6552afdf66416865a02034dd2369f0d175111 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -13,9 +13,9 @@ 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-02 10:44+0100\n"
-"Last-Translator: Stefan Koehler <stefan.koehler@GONICUS.de>\n"
-"Language-Team:  <de@li.org>\n"
+"PO-Revision-Date: 2005-12-05 07:47+0100\n"
+"Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
+"Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,11 +33,11 @@ msgstr "Administration"
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: contrib/gosa.conf:66 contrib/gosa.conf:79 contrib/gosa.conf:88
-#: contrib/gosa.conf:94 contrib/gosa.conf:99 contrib/gosa.conf:105
-#: contrib/gosa.conf:114 contrib/gosa.conf:123 contrib/gosa.conf:132
-#: contrib/gosa.conf:137 contrib/gosa.conf:142 contrib/gosa.conf:147
-#: contrib/gosa.conf:152 contrib/gosa.conf:157
+#: contrib/gosa.conf:70 contrib/gosa.conf:83 contrib/gosa.conf:92
+#: contrib/gosa.conf:98 contrib/gosa.conf:103 contrib/gosa.conf:109
+#: contrib/gosa.conf:118 contrib/gosa.conf:127 contrib/gosa.conf:136
+#: contrib/gosa.conf:141 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -51,155 +51,150 @@ msgstr "Zus
 #: plugins/admin/fai/faiHook.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
 
-#: contrib/gosa.conf:67
+#: contrib/gosa.conf:71
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:68 contrib/gosa.conf:80
+#: contrib/gosa.conf:72 contrib/gosa.conf:84
 #: plugins/personal/environment/class_environment.inc:12
 #: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
 msgid "Environment"
 msgstr "Umgebung"
 
-#: contrib/gosa.conf:69 contrib/gosa.conf:82
+#: contrib/gosa.conf:73 contrib/gosa.conf:86
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/users/class_userManagement.inc:732
 #: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:158
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
-#: contrib/gosa.conf:70 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:734
+#: 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:71 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:72 plugins/personal/generic/generic.tpl:241
-#: plugins/personal/generic/generic.tpl:372
+#: contrib/gosa.conf:76 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:732
-#: plugins/admin/departments/generic.tpl:62 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/departments/generic.tpl:62 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:73 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:376
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:734
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: 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:484
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefon"
 
-#: contrib/gosa.conf:74 contrib/gosa.conf:84 contrib/gosa.conf:90
-#: contrib/gosa.conf:95 contrib/gosa.conf:101 contrib/gosa.conf:110
-#: contrib/gosa.conf:119 contrib/gosa.conf:128 contrib/gosa.conf:133
-#: contrib/gosa.conf:138 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:153 contrib/gosa.conf:158
-msgid "References"
-msgstr "Referenzen"
-
-#: contrib/gosa.conf:75 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:78 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:81
+#: contrib/gosa.conf:79 contrib/gosa.conf:88 contrib/gosa.conf:94
+#: contrib/gosa.conf:99 contrib/gosa.conf:105 contrib/gosa.conf:114
+#: contrib/gosa.conf:123 contrib/gosa.conf:132 contrib/gosa.conf:137
+#: contrib/gosa.conf:142 contrib/gosa.conf:147 contrib/gosa.conf:152
+#: contrib/gosa.conf:157 contrib/gosa.conf:162
+msgid "References"
+msgstr "Referenzen"
+
+#: contrib/gosa.conf:85
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: contrib/gosa.conf:83
+#: contrib/gosa.conf:87
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: contrib/gosa.conf:89 plugins/admin/applications/generic.tpl:58
+#: contrib/gosa.conf:93 plugins/admin/applications/generic.tpl:66
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:100 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
+#: contrib/gosa.conf:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:652
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:106 contrib/gosa.conf:124
+#: contrib/gosa.conf:110 contrib/gosa.conf:128
 #: plugins/admin/ogroups/tabs_ogroups.inc:93
 msgid "Startup"
 msgstr "Starten"
 
-#: contrib/gosa.conf:107 contrib/gosa.conf:125
+#: contrib/gosa.conf:111 contrib/gosa.conf:129
 #: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:108 contrib/gosa.conf:126
+#: contrib/gosa.conf:112 contrib/gosa.conf:130
 #: plugins/personal/environment/environment.tpl:168
-#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/systems/class_systemManagement.inc:714
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/admin/ogroups/class_ogroupManagement.inc:489
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:109 contrib/gosa.conf:118 contrib/gosa.conf:127
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/generic.tpl:67
+#: contrib/gosa.conf:113 contrib/gosa.conf:122 contrib/gosa.conf:131
+#: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/admin/fai/headpage.tpl:20
-#: plugins/admin/fai/faiProfileEntry.tpl:22
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/admin/fai/headpage.tpl:20 plugins/admin/fai/faiProfileEntry.tpl:22
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:115
+#: contrib/gosa.conf:119
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: contrib/gosa.conf:116 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:170 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -208,87 +203,86 @@ msgstr "Dienste"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:171
-#, fuzzy
+#: contrib/gosa.conf:178
 msgid "Excel Export"
-msgstr "Export"
+msgstr "Excel-Export"
 
-#: contrib/gosa.conf:172 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/admin/applications/generic.tpl:83
+#: plugins/addons/ldapmanager/contentcsv.tpl:109
+#: plugins/addons/ldapmanager/contentcsv.tpl:112
+#: plugins/admin/applications/generic.tpl:91
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:180
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:184
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:181 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:81
+#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:89
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:542
-#: plugins/admin/fai/class_faiManagement.inc:543
+#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:553
+#: plugins/admin/fai/class_faiManagement.inc:554
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:535
-#: plugins/admin/fai/class_faiManagement.inc:536
+#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:546
+#: plugins/admin/fai/class_faiManagement.inc:547
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:193 plugins/admin/fai/class_faiManagement.inc:556
-#: plugins/admin/fai/class_faiManagement.inc:557
+#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:567
+#: plugins/admin/fai/class_faiManagement.inc:568
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:197 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:208
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:217
+#: contrib/gosa.conf:226
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:234 plugins/admin/ogroups/class_phonequeue.inc:161
+#: contrib/gosa.conf:243 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:235
+#: contrib/gosa.conf:244
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:245
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:237
+#: contrib/gosa.conf:246
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:247
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:239
+#: contrib/gosa.conf:248
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:240
+#: contrib/gosa.conf:249
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -305,18 +299,22 @@ msgstr "Italienisch"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_glpiAccount.inc:26
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/environment/class_environment.inc:13
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: 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
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
 #: plugins/admin/applications/class_applicationManagement.inc:26
@@ -324,8 +322,8 @@ msgstr "Italienisch"
 #: 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"
 
@@ -337,22 +335,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:200
+#: 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:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
+#: 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:210
-#: plugins/admin/groups/class_groupMail.inc:188
+#: 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."
@@ -360,14 +358,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:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: 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:212
-#: plugins/admin/groups/class_groupMail.inc:191
+#: 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."
@@ -375,81 +373,78 @@ 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:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
+#: 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:266
-#: plugins/admin/groups/class_groupMail.inc:250
+#: 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:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
+#: 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:316
-#: plugins/admin/groups/class_groupMail.inc:283
+#: 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:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: 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:694
-#: plugins/admin/groups/class_groupMail.inc:610
+#: 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:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
+#: plugins/personal/mail/class_mailAccount.inc: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:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
+#: 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."
+msgstr "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
+#: 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:724
-#: plugins/admin/groups/class_groupMail.inc:634
+#: 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:734
-#: plugins/admin/groups/class_groupMail.inc:642
+#: 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:738
+#: 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."
 
@@ -458,207 +453,208 @@ msgstr "Es wurde kein Ordner f
 msgid "Primary address"
 msgstr "Primäre Adresse"
 
-#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/addons/mailqueue/contents.tpl: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/admin/systems/class_terminalInfo.inc:147
-#: plugins/admin/systems/class_printGeneric.inc:353
+#: 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: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:47
+#: 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:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
+#: 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:200
+#: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/environment/hotplugDialog.tpl:73
-#: plugins/personal/environment/selectPrinterDialog.tpl:70
+#: plugins/personal/environment/hotplugDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/environment.tpl:117
 #: plugins/personal/environment/environment.tpl:134
 #: plugins/personal/environment/environment.tpl:177
 #: plugins/personal/environment/kioskManagement.tpl:13
 #: plugins/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/gofax/faxaccount/generic.tpl:76
+#: plugins/gofax/faxaccount/locals.tpl:60
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
+#: plugins/admin/groups/class_groupMail.inc: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
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/workstationStartup.tpl:53
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/workstationStartup.tpl:92
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/systems/workstationStartup.tpl:50
+#: plugins/admin/systems/workstationStartup.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:89
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:70
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/generic.tpl:39
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/fai/class_faiProfile.inc:150
+#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/class_faiProfile.inc:153
 #: plugins/admin/fai/faiProfile.tpl:37 plugins/admin/fai/faiScript.tpl:43
-#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/fai/faiTemplate.tpl:40
 #: plugins/gofon/phoneaccount/generic.tpl:13
 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
 #: plugins/personal/environment/environment.tpl:178
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:14
-#: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/lists.tpl:13
-#: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:55
-#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:14
-#: plugins/admin/groups/generic.tpl:101 plugins/admin/users/remove.tpl:14
+#: plugins/gofax/faxaccount/generic.tpl:78
+#: plugins/gofax/faxaccount/lists.tpl:14
+#: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:52
+#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:105 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/workstationStartup.tpl:54
-#: plugins/admin/systems/workstationStartup.tpl:74
+#: plugins/admin/systems/workstationStartup.tpl:51
+#: plugins/admin/systems/workstationStartup.tpl:71
 #: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:14
+#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
 #: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiProfile.tpl:38
 #: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:45
+#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:13
 #: plugins/gofon/conference/remove.tpl:14
 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
-msgid ""
-"Select to automatically response with the vacation message defined below"
+#: 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"
+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:78
+#: 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/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
+#: plugins/personal/mail/generic.tpl:130
+#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 msgid "Add local"
-msgstr "Gebietsschema hinzufügen"
+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!"
 
@@ -669,18 +665,18 @@ msgstr "schaltet alle 
 #: plugins/personal/connectivity/main.inc:115
 #: plugins/personal/environment/main.inc:104
 #: plugins/personal/nagios/main.inc:104
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:629
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:536
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/admin/fai/class_faiManagement.inc:381
-#: plugins/gofon/phoneaccount/main.inc:104
+#: 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:347
+#: plugins/admin/systems/class_systemManagement.inc:539
+#: 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:269
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
 msgid "Finish"
 msgstr "Speichern"
 
@@ -695,51 +691,52 @@ msgstr "Speichern"
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:117
 #: plugins/personal/environment/main.inc:106
-#: plugins/personal/environment/hotplugDialog.tpl:74
-#: plugins/personal/environment/selectPrinterDialog.tpl:71
+#: plugins/personal/environment/hotplugDialog.tpl:64
+#: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
 #: plugins/personal/nagios/main.inc:106
-#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/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:330
+#: 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:51
+#: plugins/admin/groups/group_objects.tpl:49
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:635
 #: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/applications/class_applicationManagement.inc:306
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/departments/class_departmentManagement.inc:349
 #: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/servnfs.tpl:92 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/class_ogroupManagement.inc:340
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/class_faiManagement.inc:383
-#: plugins/admin/fai/class_faiManagement.inc:388
+#: plugins/admin/fai/class_faiManagement.inc:394
+#: plugins/admin/fai/class_faiManagement.inc:399
 #: 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/faiPackageConfiguration.tpl:7
+#: plugins/admin/fai/faiPackageEntry.tpl:64
 #: plugins/admin/fai/faiPackageNew.tpl:66
-#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:15
+#: 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:271
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
@@ -750,7 +747,7 @@ msgstr "Abbrechen"
 #: 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 "
@@ -762,15 +759,15 @@ msgstr ""
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/nagios/main.inc:115
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/generic.tpl:86
+#: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/printer.tpl:46
 #: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
-#: plugins/admin/fai/faiHook.tpl:44 plugins/admin/fai/faiTemplate.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:112
+#: plugins/admin/fai/faiHook.tpl:44 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -786,8 +783,8 @@ msgstr "W
 #: plugins/personal/mail/mail_locals.tpl:20
 #: plugins/personal/posix/posix_groups.tpl:20
 #: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:34
-#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
@@ -796,61 +793,51 @@ msgstr "W
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:20
 #: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:32
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/admin/fai/headpage.tpl:29
 #: plugins/admin/fai/faiProfileEntry.tpl:32
-#: 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"
 msgstr "Filter"
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
-
 #: plugins/personal/mail/mail_locals.tpl:27
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:44
-#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
 #: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
+#: plugins/admin/groups/group_objects.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 msgid "Choose the department the search will be based on"
 msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
-
 #: plugins/personal/mail/mail_locals.tpl:31
 #: plugins/personal/posix/trust_machines.tpl:31
 #: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
+#: plugins/admin/groups/mail_locals.tpl:45
 msgid "Regular expression for matching addresses"
 msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
 
 #: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
+#: plugins/admin/groups/mail_locals.tpl:52
 msgid "Display addresses of user"
 msgstr "Zeige Adressen des Benutzers"
 
 #: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
+#: plugins/admin/groups/mail_locals.tpl:55
 msgid "User name of which addresses are shown"
 msgstr "Benutzername, dessen Adressen angezeigt werden"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:658
+#: 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 ihtml/themes/altlinux/login.tpl:35
@@ -863,7 +850,7 @@ msgstr "Passwort"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -921,12 +908,13 @@ msgstr ""
 "Programme anzupassen, die dieses Passwort auch benutzen."
 
 #: 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
-#: include/functions.inc:1285 ihtml/themes/altlinux/setup_step2.tpl:12
+#: include/functions.inc:1319 ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
@@ -952,7 +940,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:264
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -961,10 +949,9 @@ msgstr ""
 "(Wiederholung)' eingegeben haben sind nicht identisch."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:266
+#: plugins/admin/users/class_userManagement.inc:269
 msgid "The password you've entered as 'New password' is empty."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
 #: plugins/personal/password/main.inc:59
 msgid "The password used as new and current are too similar."
@@ -972,8 +959,7 @@ msgstr "Das alte und neue Passwort sind sich zu 
 
 #: plugins/personal/password/main.inc:64
 msgid "The password used as new is to short."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
 #: plugins/personal/password/main.inc:71
 msgid "You have no permissions to change your password."
@@ -1003,8 +989,7 @@ msgstr "W
 #: plugins/personal/posix/posix_groups.tpl:27
 #: plugins/admin/groups/headpage.tpl:40
 msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
+msgstr "Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
 
 #: plugins/personal/posix/posix_groups.tpl:27
 #: plugins/admin/groups/headpage.tpl:41
@@ -1014,8 +999,7 @@ msgstr "Zeige prim
 #: plugins/personal/posix/posix_groups.tpl:28
 #: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
+msgstr "Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
 
 #: plugins/personal/posix/posix_groups.tpl:28
 #: plugins/admin/groups/headpage.tpl:45
@@ -1083,13 +1067,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:630
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:638
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -1101,8 +1085,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"
 
@@ -1110,7 +1096,7 @@ msgstr "Status"
 msgid "Force UID/GID"
 msgstr "Erzwinge UID/GID"
 
-#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
@@ -1147,32 +1133,32 @@ msgstr "UNIX-Einstellungen"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: 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:209
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:219
+#: 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:240
-#: plugins/personal/posix/class_posixAccount.inc:243
+#: 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:241
+#: 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."
@@ -1180,7 +1166,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:244
+#: plugins/personal/posix/class_posixAccount.inc:249
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1188,11 +1174,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:247
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:253
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1200,247 +1186,242 @@ 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:432
+#: 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"
+msgstr "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:434
+#: 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:436
+#: 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:438
+#: 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:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Januar"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Februar"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "März"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: plugins/personal/samba/class_sambaAccount.inc:370
-#: plugins/personal/samba/class_sambaAccount.inc:388
-#: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:237
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "August"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:238
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:239
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc: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/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Dezember"
 
-#: plugins/personal/posix/class_posixAccount.inc:545
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:550
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:545
+#: plugins/personal/posix/class_posixAccount.inc:550
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:546
+#: 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:715
+#: plugins/personal/posix/class_posixAccount.inc:721
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:874
+#: 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:877
+#: 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."
+msgstr "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: 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:888
+#: 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:892
-#: plugins/admin/groups/class_groupGeneric.inc:642
+#: 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:895
-#: plugins/admin/groups/class_groupGeneric.inc:645
+#: 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:903
+#: 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:908
+#: 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:913
+#: 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:916
+#: 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:919
+#: 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."
+msgstr "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: 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."
+msgstr "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: 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:930
+#: 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."
+msgstr "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: 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:1039
-#: plugins/admin/groups/class_groupGeneric.inc:676
+#: 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 "
@@ -1455,20 +1436,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:631
+#: 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"
 
@@ -1484,91 +1465,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:638
+#: 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:639
+#: 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:640
+#: 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"
 
@@ -1584,19 +1565,15 @@ msgstr "W
 msgid "Display workstations of department"
 msgstr "Zeige die Arbeitsstationen der Abteilung"
 
-#: plugins/personal/samba/samba3_workstations.tpl:30
-msgid "Display workstations matching"
-msgstr "Zeige die Arbeitsstationen, auf die Folgendes passt"
-
-#: plugins/personal/samba/class_sambaAccount.inc:193
+#: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto besitzt keine Samba-Erweiterungen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:202
+#: plugins/personal/samba/class_sambaAccount.inc:205
 msgid "Remove samba account"
 msgstr "Samba-Konto entfernen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:203
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1604,12 +1581,12 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Samba-Erweiterungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
 #: plugins/personal/samba/class_sambaAccount.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid "Create samba account"
 msgstr "Samba-Konto erstellen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:217
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1617,7 +1594,7 @@ msgstr ""
 "Dieses Konto besitzt deaktivierte Samba-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:220
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1626,52 +1603,51 @@ msgstr ""
 "aktivieren werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert "
 "werden."
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:455
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "disconnect"
 msgstr "trennen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: 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:643
+#: plugins/personal/samba/class_sambaAccount.inc:651
 #, php-format
-msgid ""
-"The timeout property '%s' is checked and contains invalid or no characters!"
+msgid "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:657
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1679,7 +1655,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:833
+#: 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!"
@@ -1687,7 +1663,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:858
+#: plugins/personal/samba/class_sambaAccount.inc:866
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1695,96 +1671,96 @@ msgstr ""
 "Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, daher "
 "kann keine Umwandlung in eine Samba-Gruppe vorgenommen werden!"
 
-#: plugins/personal/generic/class_user.inc:248
+#: plugins/personal/generic/class_user.inc:251
 msgid "female"
 msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:248
+#: plugins/personal/generic/class_user.inc:251
 msgid "male"
 msgstr "männlich"
 
-#: plugins/personal/generic/class_user.inc:262
+#: plugins/personal/generic/class_user.inc:265
 msgid "This account has no valid GOsa extensions."
 msgstr "Dieses Konto besitzt keine gültigen GOsa-Erweiterungen."
 
-#: plugins/personal/generic/class_user.inc:291
+#: plugins/personal/generic/class_user.inc:294
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
 "abgebrochen."
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
 msgid "Please enter a valid serial number"
 msgstr "Bitte geben Sie eine gültige Seriennummer ein"
 
-#: plugins/personal/generic/class_user.inc:424
-#, fuzzy, php-format
+#: plugins/personal/generic/class_user.inc:427
+#, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 "Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
 "s</b>)."
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:427
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:427
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:431
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:835
+#: 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:852
+#: 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:863
+#: 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:893
+#: 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:907
+#: 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:912
+#: 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:918
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:543
+#: 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:927
+#: 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:933
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:546
+#: 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:936
+#: 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:943
+#: plugins/personal/generic/class_user.inc:948
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1792,7 +1768,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:950
+#: plugins/personal/generic/class_user.inc:955
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1800,50 +1776,50 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:953
+#: 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:956
-#: plugins/personal/generic/class_user.inc:984
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/personal/generic/class_user.inc: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:959
-#: plugins/personal/generic/class_user.inc:981
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
+#: plugins/personal/generic/class_user.inc: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:964
-#: plugins/personal/generic/class_user.inc:967
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:169
+#: 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:970
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:172
+#: 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:973
-#: plugins/addons/addressbook/class_addressbook.inc:554
+#: 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:976
-#: plugins/addons/addressbook/class_addressbook.inc:557
+#: 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:1103
+#: plugins/personal/generic/class_user.inc:1108
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
@@ -1871,238 +1847,230 @@ msgstr "Bild"
 msgid "Change picture"
 msgstr "Bild ändern"
 
-#: 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:504
-#: plugins/admin/users/template.tpl:19 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
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:54 html/getxls.php:149
-#: html/getxls.php:194 html/getxls.php:203 html/getxls.php:206
-msgid "Name"
-msgstr "Name"
+#: 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
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
+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:34 plugins/admin/users/template.tpl:28
+#: 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:75
+#: plugins/personal/generic/generic.tpl:82
 #: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Setzen"
 
-#: plugins/personal/generic/generic.tpl:81 html/getxls.php:194
+#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: 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:33
+#: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
 #: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:22
 #: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr "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:121
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_edit.tpl:93
+#: 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
+#: plugins/admin/departments/generic.tpl:54 html/getxls.php:174
 msgid "Address"
 msgstr "Adresse"
 
-#: 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:183 html/getxls.php:206
+#: plugins/personal/generic/generic.tpl:190 html/getxls.php:236
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/generic.tpl:187
+#: plugins/personal/generic/generic.tpl:194
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/addons/addressbook/address_edit.tpl:75
+#: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:686
-#: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:586
-#: plugins/admin/ogroups/class_ogroupManagement.inc:414
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/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: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:231
+#: plugins/personal/generic/generic.tpl:238
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:51
-#: plugins/addons/addressbook/address_info.tpl:40
+#: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: 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_info.tpl:91 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/generic.tpl:257
+#: plugins/personal/generic/generic.tpl:264
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:149
+#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/admin/departments/generic.tpl:46 html/getxls.php:149
+#: plugins/personal/generic/generic.tpl:268
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
+#: html/getxls.php:236
 msgid "State"
 msgstr "Land"
 
-#: 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:339
-#: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:149
+#: plugins/personal/generic/generic.tpl:346
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: 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"
 
@@ -2111,9 +2079,8 @@ msgid "Remove picture"
 msgstr "Bild entfernen"
 
 #: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/addons/addressbook/address_edit.tpl:114
-#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/systems/servnfs.tpl:75
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 msgid "Save"
 msgstr "Sichern"
@@ -2125,16 +2092,16 @@ msgstr "Standard-Zertifikat"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/personal/environment/environment.tpl:118
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/admin/groups/class_groupMail.inc:408
-#: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/admin/systems/workstationStartup.tpl:93
+#: plugins/admin/groups/class_groupMail.inc:417
+#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/admin/systems/workstationStartup.tpl:90
 #: plugins/admin/systems/printer.tpl:47
 #: plugins/admin/systems/terminalStartup.tpl:81
-#: plugins/admin/fai/faiPackage.tpl:74
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:245
+#: plugins/admin/fai/faiPackage.tpl:75
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Entfernen"
@@ -2164,23 +2131,23 @@ msgstr "Generische Benutzer-Information"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+#: 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:128
+#: 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:131
+#: 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:134
+#: 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:137
+#: 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."
 
@@ -2188,25 +2155,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"
 
@@ -2214,14 +2181,13 @@ msgstr "pro"
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/connectivity/class_kolabAccount.inc:105
+msgid "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Stellvertreter "
 "aufzunehmen."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
+#: plugins/personal/connectivity/class_kolabAccount.inc:113
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2229,44 +2195,44 @@ msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, ist keine primäre Mail-"
 "Adresse eines bestehenden Benutzers"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
 msgid "Always accept"
 msgstr "Immer annehmen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid "Always reject"
 msgstr "Immer ablehnen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
+#: plugins/personal/connectivity/class_kolabAccount.inc:142
 msgid "Reject if conflicts"
 msgstr "Im Konfliktfall ablehnen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:143
 msgid "Manual if conflicts"
 msgstr "Im Konfliktfall manuell bearbeiten"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:144
 msgid "Manual"
 msgstr "Manuell"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
+#: plugins/personal/connectivity/class_kolabAccount.inc:180
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:232
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "Der Wert für Intervall muß eine Ganzzahl sein."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
+#: plugins/personal/connectivity/class_kolabAccount.inc:237
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Der Wert für Information URL is ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/connectivity/class_kolabAccount.inc:251
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#: plugins/personal/connectivity/class_kolabAccount.inc:259
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2277,7 +2243,7 @@ msgstr ""
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
+#: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
 
@@ -2327,7 +2293,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"
 
@@ -2335,105 +2301,94 @@ msgstr "WebDAV-Konto"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#, php-format
 msgid ""
 "This account has %s features disabled. Posix features are needed for "
 "openXchange accounts, enable them first."
 msgstr ""
-"Dieses Konto besitzt deaktivierte OpenXchange-Erweiterungen. Um diese zu "
-"aktivieren, werden UNIX-Erweiterungen benötigt. Diese müssen zuerst "
-"aktiviert werden."
+"Dieses Konto besitzt deaktivierte %s-Erweiterungen. Um diese zu aktivieren, "
+"werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert werden."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-#, fuzzy
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
 msgid "OpenXchange"
-msgstr "Open-Xchange"
+msgstr "OpenXchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
+#, php-format
 msgid ""
 "This account has %s features disabled. Mail features are needed for "
 "openXchange accounts, enable them first."
 msgstr ""
-"Dieses Konto besitzt deaktivierte OpenXchange-Erweiterungen. Um diese zu "
-"aktivieren, werden UNIX-Erweiterungen benötigt. Diese müssen zuerst "
-"aktiviert werden."
+"Dieses Konto besitzt deaktivierte %s-Erweiterungen. Um diese zu aktivieren, "
+"werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert werden."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-#, fuzzy
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:789
 msgid "Couldn't connect to postgresql database!"
-msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden"
+msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#, fuzzy
-msgid "Needed parameters to openexchange connectivity plugin are missing!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:793
+msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
-"Benötigte Parameter für Open-Xchange Konnektivitätserweiterung "
-"fehlgeschlagen!"
+"Nicht alle benötigten Parameter für OpenXchange Konnektivitätserweiterung "
+"wurden gefunden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-#, fuzzy
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:797
 msgid "PHP4 module for postgresql database is missing!"
-msgstr "PHP4-Erweiterung für PostgreSQL Datenbank fehlgeschlagen!"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-#, fuzzy
-msgid "Needed parameters for openexchange connectivity plugin are missing!"
-msgstr ""
-"Benötigte Parameter für Open-Xchange Konnektivitätserweiterung "
-"fehlgeschlagen!"
+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/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"
 
@@ -2469,7 +2424,7 @@ msgstr "Benutzerinformation"
 msgid "User Timezone"
 msgstr "Zeitzone des Benutzers"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
+#: plugins/personal/connectivity/class_connectivity.inc:63
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
 
@@ -2478,70 +2433,94 @@ msgstr "Dieses Konto besitzt keine Konnektivit
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:299
 msgid "hour"
 msgstr "Stunde"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "day"
 msgstr "Tag"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "week"
 msgstr "Woche"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "month"
 msgstr "Monat"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:130
+#: 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:133
+#: 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."
+msgstr "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
 
-#: plugins/personal/connectivity/intranet.tpl:1
+#: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
+#: plugins/personal/connectivity/pptp.tpl:3
+msgid "PPTP account"
+msgstr "PPTP-Konto"
+
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "GLPI-Konto"
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr "Intranet"
 
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr "PPTP"
+
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
+msgid "PHPscheduleit account"
+msgstr "PHPscheduleit-Konto"
+
+#: plugins/personal/connectivity/class_glpiAccount.inc:25
+msgid "GLPI"
+msgstr "GLPI"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr "PHPscheduleit"
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr "Einstellungen der Benutzer-Umgebung"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:109
+#: plugins/personal/environment/class_hotplugDialog.inc:111
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Bitte geben Sie einen gültigen Namen ein (0-9 und a-z sind erlaubt)."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:112
+#: plugins/personal/environment/class_hotplugDialog.inc:114
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Ungültiges Zeichen im Feld 'Beschreibung'. Bitte geben Sie eine gültige "
 "Beschreibung ein."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:115
+#: plugins/personal/environment/class_hotplugDialog.inc:117
 msgid "Please specify a valid id."
 msgstr "Bitte geben Sie eine gültige ID ein!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:123
 msgid "An Entry with this name already exists."
 msgstr "Ein Eintrag mit diesem Namen existiert bereits."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:126
+#: plugins/personal/environment/class_hotplugDialog.inc:128
 msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
@@ -2557,62 +2536,54 @@ msgstr "Verwaltung der Hotplug-Ger
 msgid "Select hotplug device to add"
 msgstr "Auswahl des hinzuzufügenden Hotplug-Gerätes"
 
-#: plugins/personal/environment/hotplugDialog.tpl:28
-msgid ""
-"This menu allows you to select existing hotplug devices. All devices of all "
-"users are choosable here."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen, bestehende Hotplug-Geräte zu verwenden. Es "
-"werden alle Geräte aller Benutzer angezeigt."
-
-#: plugins/personal/environment/hotplugDialog.tpl:44
+#: plugins/personal/environment/hotplugDialog.tpl:34
 msgid "Choose the department the search will be based    on"
 msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
-#: plugins/personal/environment/hotplugDialog.tpl:53
-#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/groups/group_objects.tpl:38
 #: plugins/admin/users/headpage.tpl:48
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
-#: plugins/personal/environment/hotplugDialog.tpl:58
+#: plugins/personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr "Regulärer Ausdruck zum Erkennen von Hotplug-Geräten"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:64
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:95
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
 
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:250
+#: plugins/personal/environment/class_environment.inc:246
+#: plugins/personal/environment/class_environment.inc:282
 msgid "Remove environment extension"
 msgstr "Umgebungs-Erweiterung entfernen"
 
-#: plugins/personal/environment/class_environment.inc:215
-#: plugins/personal/environment/class_environment.inc:251
+#: plugins/personal/environment/class_environment.inc:247
+#: plugins/personal/environment/class_environment.inc:283
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Dieses Konto besitzt aktivierte Umgebungs-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/personal/environment/class_environment.inc:224
-#: plugins/personal/environment/class_environment.inc:229
-#: plugins/personal/environment/class_environment.inc:257
-#: plugins/personal/environment/class_environment.inc:262
+#: plugins/personal/environment/class_environment.inc:256
+#: plugins/personal/environment/class_environment.inc:261
+#: plugins/personal/environment/class_environment.inc:289
+#: plugins/personal/environment/class_environment.inc:294
 msgid "Add environment extension"
 msgstr "Umgebungs-Erweiterung hinzufügen"
 
-#: plugins/personal/environment/class_environment.inc:225
-#: plugins/personal/environment/class_environment.inc:258
+#: plugins/personal/environment/class_environment.inc:257
+#: plugins/personal/environment/class_environment.inc:290
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Aktuell besitzt dieses Konto keine aktivierten Umgebungs-Erweiterungen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:230
-#: plugins/personal/environment/class_environment.inc:263
+#: plugins/personal/environment/class_environment.inc:262
+#: plugins/personal/environment/class_environment.inc:295
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -2621,18 +2592,18 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:449
-#: plugins/personal/environment/class_environment.inc:451
-#: plugins/admin/systems/class_terminalStartup.inc:131
-#: plugins/admin/systems/class_workstationStartup.inc:277
+#: 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: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:679
+#: 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:686
+#: plugins/personal/environment/class_environment.inc:724
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -2640,21 +2611,21 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:708
+#: 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:801
+#: plugins/personal/environment/class_environment.inc:839
 msgid "Error while writing printer"
 msgstr "Fehler beim Speichern des Druckers"
 
-#: plugins/personal/environment/class_environment.inc:871
+#: 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:986
+#: plugins/personal/environment/class_environment.inc:1031
 msgid "Admin"
 msgstr "Administrator"
 
@@ -2668,22 +2639,11 @@ msgstr "Drucker hinzuf
 msgid "Select printer to add"
 msgstr "Wählen Sie den hinzuzufügenden Drucker"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:28
-#, fuzzy
-msgid ""
-"This menu allows you to create, edit and delete selected printers. Having a "
-"great number of printers, you may want to use the range selectors on top of "
-"the printers list."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen Drucker hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer großen Anzahl von Druckern bietet sich die Verwendung "
-"der Bereichsauswahl an."
-
-#: plugins/personal/environment/selectPrinterDialog.tpl:53
+#: plugins/personal/environment/selectPrinterDialog.tpl:43
 msgid "Display printers matching"
 msgstr "Zeige die Drucker, auf die Folgendes passt"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:58
+#: plugins/personal/environment/selectPrinterDialog.tpl:48
 msgid "Regular expression for matching printer names"
 msgstr "Regulärer Ausdruck zum Erkennen von Druckernamen"
 
@@ -2740,13 +2700,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"
@@ -2798,7 +2758,7 @@ msgstr "Skriptname"
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
 #: plugins/admin/systems/printer.tpl:13 plugins/admin/systems/servnfs.tpl:17
@@ -2813,8 +2773,8 @@ msgstr "Skriptname"
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
-#: plugins/generic/references/contents.tpl:11 html/getxls.php:103
-#: html/getxls.php:200
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
+#: html/getxls.php:230
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2839,11 +2799,27 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 msgid "Logon script"
 msgstr "Anmelde-Skript"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:93
+#: 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/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiPackageEntry.tpl:63
+msgid "Apply"
+msgstr "Anwenden"
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
 msgid "Specified name is invalid."
 msgstr "Der angegebene Name ist ungültig."
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
 msgid "Specified description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
@@ -2868,27 +2844,25 @@ msgstr "Ger
 msgid "save"
 msgstr "Sichern"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#: plugins/personal/environment/class_kioskManagementDialog.inc:61
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-"Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Zugriff verweigert."
+msgstr "Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Zugriff verweigert."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#: plugins/personal/environment/class_kioskManagementDialog.inc:64
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 "Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Datei existiert "
 "nicht."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:81
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+msgid "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 "In Ihrer gosa.conf wurde kein 'KIOSKPATH' definiert. Die Verwaltung von "
 "KIOSK-Profilen ist nicht möglich."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:87
+#: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2906,24 +2880,19 @@ msgstr "Verwaltung der Kiosk-Profile"
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: plugins/personal/environment/kioskManagement.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:59
-msgid "Close"
-msgstr "Schliessen"
-
 #: plugins/personal/nagios/main.inc:124
-msgid "User nagios settings"
-msgstr "Benutzerspezifische Nagios-Einstellungen"
+msgid "Nagios settings"
+msgstr "Nagios-Einstellungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:82
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 msgid "This account has no nagios extensions."
 msgstr "Dieses Konto besitzt keine Nagios-Erweiterungen."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:91
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 msgid "Remove nagios account"
 msgstr "Nagios-Konto entfernen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
@@ -2931,11 +2900,11 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Nagios-Erweiterungen. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 msgid "Create nagios account"
 msgstr "Neues Nagios-Konto erzeugen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
@@ -2943,72 +2912,86 @@ msgstr ""
 "Dieses Konto besitzt keine aktivierten Nagios-Erweiterungen. Sie können "
 "diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:169
+#: plugins/personal/nagios/class_nagiosAccount.inc:163
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:166
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-#: plugins/personal/nagios/class_nagiosAccount.inc:180
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
 msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr ""
-"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
+msgstr "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
 
 #: plugins/personal/nagios/nagios.tpl:4
 msgid "Nagios Account"
 msgstr "Nagios-Konto"
 
 #: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
 msgid "Alias"
 msgstr "Alias"
 
-#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:149
-#, fuzzy
+#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:174
 msgid "Mail address"
-msgstr "MAC-Adresse"
+msgstr "Mail-Adresse"
 
 #: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
 msgid "Host notification period"
-msgstr "Frequenz der System-Benachrichtigungen"
+msgstr "Frequenz der System-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
 msgid "Service notification period"
-msgstr "Frequenz der Dienst-Benachrichtigungen"
+msgstr "Frequenz der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:32
-#, fuzzy
 msgid "Service notification options"
-msgstr "Optionen für Dienst-Benachrichtigungen"
+msgstr "Optionen für Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:41
-#, fuzzy
 msgid "Host notification options"
-msgstr "Optionen für System-Benachrichtigungen"
+msgstr "Optionen für System-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:53
-#, fuzzy
 msgid "Service notification commands"
-msgstr "Befehle für Dienst-Benachrichtigungen"
+msgstr "Befehle für Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:57
-#, fuzzy
 msgid "Host notification commands"
-msgstr "Optionen für System-Benachrichtigungen"
+msgstr "Befehle für System-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:66
 msgid "Nagios authentification"
-msgstr ""
+msgstr "Nagios Authentifikation"
 
-#: plugins/personal/nagios/nagios.tpl:68
-#, fuzzy
-msgid "can view system informations"
-msgstr "System-Information"
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
+msgstr "System-Informationen anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
+msgstr "Konfiguration anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr "Alle System-Befehle ausführen"
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr "Alle Dienste anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr "Alle Systeme anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr "Alle Dienst-Befehle ausführen"
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
+msgstr "Alle Host-Befehle ausführen"
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -3025,10 +3008,10 @@ msgstr "W
 #: 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:176
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr "Typ"
@@ -3045,101 +3028,101 @@ msgstr "Beschreibender Text zu dieser Sperrliste"
 msgid "Blocked numbers"
 msgstr "Gesperrte Nummern"
 
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/gofax/blocklists/generic.tpl:72
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
-msgstr "FAX-Sperrlisten"
+msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:206
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Sie möchten die Sperrliste '%s' löschen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+#: 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:235
+#: 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:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:666
-#: plugins/admin/applications/class_applicationManagement.inc:323
+#: 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:277
-#: plugins/admin/systems/class_systemManagement.inc:562
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/fai/class_faiManagement.inc:417
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: 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:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:666
-#: plugins/admin/applications/class_applicationManagement.inc:323
+#: plugins/admin/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:277
-#: plugins/admin/systems/class_systemManagement.inc:562
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:417
+#: plugins/admin/fai/class_faiManagement.inc:428
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Up"
 msgstr "Auf"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:667
-#: plugins/admin/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:563
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
-#: plugins/admin/fai/class_faiManagement.inc:420
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
+#: plugins/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:278
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: 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:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:667
-#: plugins/admin/applications/class_applicationManagement.inc:324
+#: 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:278
-#: plugins/admin/systems/class_systemManagement.inc:563
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
-#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: 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:289
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Root"
 msgstr "Wurzel"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:668
-#: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:564
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/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:361
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:668
-#: plugins/admin/applications/class_applicationManagement.inc:325
+#: plugins/admin/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:279
-#: plugins/admin/systems/class_systemManagement.inc:564
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: 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:290
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Home"
 msgstr "Heimat"
 
@@ -3153,78 +3136,79 @@ msgstr "Neue Sperrlisten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:673
-#: plugins/admin/applications/class_applicationManagement.inc:329
+#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/applications/class_applicationManagement.inc:332
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:573
-#: plugins/admin/ogroups/class_ogroupManagement.inc:364
-#: plugins/admin/fai/class_faiManagement.inc:452
+#: plugins/admin/systems/class_systemManagement.inc:576
+#: 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:294
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Current base"
 msgstr "Momentane Basis"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/applications/class_applicationManagement.inc:333
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:574
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/admin/fai/class_faiManagement.inc:453
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: 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:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit department"
 msgstr "Aktualisieren"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/applications/class_applicationManagement.inc:333
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:574
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/admin/fai/class_faiManagement.inc:453
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: 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:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit"
 msgstr "Übertragen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/applications/class_applicationManagement.inc:337
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:579
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:582
+#: 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:299
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "Bearbeiten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:677
+#: 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:301
+#: plugins/addons/mailqueue/contents.tpl:95
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/applications/class_applicationManagement.inc:338
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:580
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/fai/class_faiManagement.inc:472
+#: plugins/admin/systems/class_systemManagement.inc:583
+#: 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:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "delete"
 msgstr "Entfernen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:679
+#: plugins/admin/users/class_userManagement.inc:683
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Benutzer entfernen"
@@ -3236,14 +3220,14 @@ msgstr "Name der Sperrliste"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/admin/applications/class_applicationManagement.inc:355
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:391
-#: plugins/admin/fai/class_faiManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:692
+#: plugins/admin/applications/class_applicationManagement.inc:358
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_systemManagement.inc:590
+#: 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:315
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -3259,25 +3243,24 @@ msgstr "senden"
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
+#: 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."
+msgstr "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-#: plugins/admin/departments/class_departmentGeneric.inc:154
+#: 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:534
+#: 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:542
+#: 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:549
+#: 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 "
@@ -3289,7 +3272,7 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: 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
 msgid "Warning"
@@ -3307,7 +3290,6 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
 #: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
 #: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-#, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Wenn Sie sicher sind, drücken Sie <i>Löschen</i> um fortzufahren oder "
@@ -3357,11 +3339,11 @@ msgstr "Sperrlistenverwaltung"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
 msgid "Fax number for GOfax to trigger on"
-msgstr "FAX-Nummer, auf die GOfax ansprechen soll"
+msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:54
-#: html/getxls.php:194
+#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: html/getxls.php:224
 msgid "Language"
 msgstr "Sprache"
 
@@ -3375,7 +3357,7 @@ msgstr "Auslieferungsformat"
 
 #: plugins/gofax/faxaccount/generic.tpl:26
 msgid "Specify delivery format for fax to mail gateway"
-msgstr "Geben Sie das Auslieferungsformat des FAX to Mailgateways an"
+msgstr "Geben Sie das Auslieferungsformat des Fax to Mailgateways an"
 
 #: plugins/gofax/faxaccount/generic.tpl:38
 msgid "Delivery methods"
@@ -3383,7 +3365,7 @@ msgstr "Auslieferungsmethode"
 
 #: plugins/gofax/faxaccount/generic.tpl:41
 msgid "Temporary disable fax usage"
-msgstr "Temporäres Abschalten der FAX-Benutzung"
+msgstr "Temporäres Abschalten der Fax-Benutzung"
 
 #: plugins/gofax/faxaccount/generic.tpl:45
 msgid "Deliver fax as mail to"
@@ -3399,19 +3381,19 @@ msgstr "Fax an Drucker weiterleiten"
 
 #: plugins/gofax/faxaccount/generic.tpl:69
 msgid "Alternate fax numbers"
-msgstr "Alternative FAX-Nummern"
+msgstr "Alternative Fax-Nummern"
 
-#: plugins/gofax/faxaccount/generic.tpl:85
+#: plugins/gofax/faxaccount/generic.tpl:81
 msgid "Blocklists"
 msgstr "Sperrlisten"
 
-#: plugins/gofax/faxaccount/generic.tpl:88
+#: plugins/gofax/faxaccount/generic.tpl:84
 msgid "Blocklists for incoming fax"
-msgstr "Sperrlisten für eingehendes FAX"
+msgstr "Sperrlisten für eingehendes Fax"
 
-#: plugins/gofax/faxaccount/generic.tpl:94
+#: plugins/gofax/faxaccount/generic.tpl:90
 msgid "Blocklists for outgoing fax"
-msgstr "Sperrlisten für abgehendes FAX"
+msgstr "Sperrlisten für abgehendes Fax"
 
 #: plugins/gofax/faxaccount/locals.tpl:6
 msgid "Select numbers to add"
@@ -3421,85 +3403,66 @@ msgstr "W
 msgid "Display numbers of department"
 msgstr "Zeige die Nummern der Abteilung"
 
-#: plugins/gofax/faxaccount/locals.tpl:40
+#: plugins/gofax/faxaccount/locals.tpl:38
 msgid "Display numbers matching"
 msgstr "Zeige die Nummern, auf die Folgendes passt"
 
-#: plugins/gofax/faxaccount/locals.tpl:43
+#: plugins/gofax/faxaccount/locals.tpl:41
 msgid "Regular expression for matching numbers"
 msgstr "Regulärer Ausdruck zum Abgleich mit Telefonnummern"
 
-#: plugins/gofax/faxaccount/locals.tpl:49
+#: plugins/gofax/faxaccount/locals.tpl:47
 msgid "Display numbers of user"
 msgstr "Zeige Nummern des Benutzers"
 
-#: plugins/gofax/faxaccount/locals.tpl:52
+#: plugins/gofax/faxaccount/locals.tpl:50
 msgid "User name of which numbers are shown"
 msgstr "Benutzername, dessen Nummern angezeigt werden"
 
-#: plugins/gofax/faxaccount/lists.tpl:4
+#: plugins/gofax/faxaccount/lists.tpl:5
 msgid "Blocked numbers/lists"
 msgstr "Gesperrte Nummern/Listen"
 
-#: plugins/gofax/faxaccount/lists.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:24
-msgid "Select a specific department"
-msgstr "Wählen Sie eine bestimmte Abteilung"
-
-#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
-#: plugins/admin/groups/mail_admins.tpl:30
-msgid "Choose"
-msgstr "Wählen"
-
-#: plugins/gofax/faxaccount/lists.tpl:27
+#: plugins/gofax/faxaccount/lists.tpl:17
 msgid "List of predefined blocklists"
 msgstr "Liste von vordefinierten Sperrlisten"
 
-#: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/fai/faiProfileEntry.tpl:71
-#: plugins/admin/fai/faiScriptEntry.tpl:67
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
-#: plugins/admin/fai/faiPackageEntry.tpl:65 include/functions.inc:1276
-msgid "Apply"
-msgstr "Anwenden"
+#: plugins/gofax/faxaccount/lists.tpl:25
+msgid "Add the list to the blocklists"
+msgstr "Liste zu den Sperrlisten hinzufügen"
 
 #: plugins/gofax/faxaccount/main.inc:105
 msgid "FAX settings"
-msgstr "FAX-Einstellungen"
+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"
-msgstr "FAX"
+msgstr "Fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:111
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:137
 msgid "This account has no fax extensions."
-msgstr "Dieses Konto besitzt keine FAX-Erweiterungen."
+msgstr "Dieses Konto besitzt keine Fax-Erweiterungen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:120
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
 msgid "Remove fax account"
-msgstr "FAX-Konto entfernen"
+msgstr "Fax-Konto entfernen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Dieses Konto besitzt aktivierte die Fax-Erweiterungen. Sie können diese "
-"durch einen Klick auf die Schaltfläche unten deaktivieren."
+"Dieses Konto besitzt aktivierte Fax-Erweiterungen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
 msgid "Create fax account"
-msgstr "FAX-Konto erzeugen"
+msgstr "Fax-Konto erzeugen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -3507,28 +3470,36 @@ msgstr ""
 "Aktuell besitztt dieses Konto keine aktivierten Fax-Erweiterungen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:218
 msgid "You're trying to add an invalid phone number."
 msgstr "Sie versuchen, eine ungültige Telefonnummer hinzuzufügen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
+#: 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"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
 msgid "The required field 'Fax' is not set."
 msgstr "Das benötigte Feld 'Fax' ist nicht gesetzt."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:641
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Bitte geben Sie eine gültige Telefonnummer im Feld 'Fax' an."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:649
 msgid "Mail delivery is checked, but no address has been specified."
-msgstr ""
-"Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
+msgstr "Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "The mail address you've entered is invalid."
 msgstr "Die Mail Adresse, die Sie eingegeben haben, ist ungültig."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:657
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3536,150 +3507,191 @@ 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"
+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"
+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"
+msgstr "Fax-ID"
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:560
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/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/gofon/reports/contents.tpl:6
+#: plugins/addons/logview/contents.tpl:47
+#: 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:21
+#: plugins/gofax/faxreports/contents.tpl:21
 #: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:27
+#: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Suchen"
 
-#: 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/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"
+msgstr "Fax-Berichte"
 
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
+#: 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 "
+"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
 "angezeigt werden!"
 
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
+#: 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 "
+"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
 "werden!"
 
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
+#: 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!"
+msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:117
+#: 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!"
+msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
+#: 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"
+msgstr "Fax-Berichte"
+
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_info.tpl:16
+#: 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
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Name"
 
 #: 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"
@@ -3747,10 +3759,10 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
+#: plugins/addons/addressbook/class_addressbook.inc: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"
 
@@ -3758,39 +3770,39 @@ 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:29
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Initials"
 msgstr "Initialien"
 
-#: 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:78
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:149
-#: html/getxls.php:206
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
 msgid "City"
 msgstr "Stadt"
 
-#: 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"
@@ -3813,12 +3825,12 @@ msgstr "Adressbuch"
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:149
+#: 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:153
+#: plugins/addons/addressbook/class_addressbook.inc:158
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -3826,78 +3838,82 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:182
-#: plugins/addons/addressbook/class_addressbook.inc:286
+#: 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:280
+#: 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:376
+#: 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:380
+#: 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:466
+#: plugins/addons/addressbook/class_addressbook.inc:467
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
-#, fuzzy
+#: plugins/addons/addressbook/class_addressbook.inc:470
 msgid "user database"
-msgstr "FAX-Datenbank"
+msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:473
-#, fuzzy, php-format
+#: plugins/addons/addressbook/class_addressbook.inc:474
+#, php-format
 msgid "Contact stored in '%s'"
-msgstr "Kontakt ist in %s abgelegt"
+msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:476
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/logview/class_logview.inc:63
-#: plugins/addons/logview/class_logview.inc:77
+#: 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:505
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:65
+#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+msgid "Given name"
+msgstr "Vorname"
+
+#: plugins/addons/addressbook/class_addressbook.inc:516
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:516
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:149
+#: plugins/addons/addressbook/class_addressbook.inc:517 html/getxls.php:174
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:66
-#: html/getxls.php:88 html/getxls.php:103 html/getxls.php:238
-#: html/getxls.php:253
+#: plugins/addons/addressbook/class_addressbook.inc:517 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/addons/addressbook/class_addressbook.inc:578
-msgid ""
-"Cannot create a unique DN for your entry. Please fill more formular fields."
+#: 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:590
-msgid ""
-"You have no permissions to create or modify a global address book entry."
+#: plugins/addons/addressbook/class_addressbook.inc:606
+msgid "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Sie haben keine Berechtigung, einen Eintrag unterhalb dieser 'Basis' "
 "anzulegen."
@@ -3907,51 +3923,51 @@ msgstr ""
 msgid "LDIF export"
 msgstr "LDIF exportieren"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:93
+#: 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:154
+#: 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:200
+#: plugins/addons/ldapmanager/class_csvimport.inc:209
 msgid "failed"
 msgstr "Fehlgeschlagen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:204
+#: plugins/addons/ldapmanager/class_csvimport.inc:213
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:261
+#: plugins/addons/ldapmanager/class_csvimport.inc:277
 msgid "status"
 msgstr "Status"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:265
+#: 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:290
+#: plugins/addons/ldapmanager/class_csvimport.inc:319
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:302
-#: plugins/addons/ldapmanager/class_csvimport.inc:313
-#: plugins/addons/ldapmanager/class_csvimport.inc:318
-#: plugins/addons/ldapmanager/class_import.inc:59
-#: plugins/addons/ldapmanager/class_import.inc:67
+#: plugins/addons/ldapmanager/class_csvimport.inc: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:307
-#: plugins/addons/ldapmanager/class_import.inc:52
+#: 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:446
+#: 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..."
 
@@ -4014,18 +4030,17 @@ msgstr "Es gab einen Fehler w
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:39
 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"
 
-#: plugins/addons/ldapmanager/class_import.inc:38
+#: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
-msgstr ""
-"Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu importieren."
+msgstr "Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu importieren."
 
-#: plugins/addons/ldapmanager/class_import.inc:105
+#: plugins/addons/ldapmanager/class_import.inc:108
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
@@ -4067,8 +4082,7 @@ msgstr "Export erfolgreich"
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-"Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
+msgstr "Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the LDAP Export "
@@ -4079,122 +4093,109 @@ 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:35
+#: plugins/addons/ldapmanager/class_export.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."
+msgstr "Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
 
-#: plugins/addons/ldapmanager/class_export.inc:80
-#: plugins/addons/ldapmanager/class_exportxls.inc:85
+#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
 msgid "Error while exporting the requested entries!"
 msgstr "Fehler beim Export der angeforderten Einträge!"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
-#, fuzzy
 msgid ""
 "The XLS export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as xls. You may save these files for "
 "documentation."
 msgstr ""
 "Dieses Modul ermöglicht Ihnen den Download der kompletten momentan "
-"verwendeten LDAP-Datenbank. Die übertragenen Dateien können beispielsweise "
-"zur Datensicherung oder zur Einrichtung eines neuen Servers benutzt werden."
+"verwendeten LDAP-Datenbank als xls-Datei. Die übertragenen Dateien können "
+"beispielsweise zur Dokumentation/Übersicht verwendet werden."
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:14
-#, fuzzy
 msgid "Choose the data you want to Export"
-msgstr "Wählen Sie die Abteilung, die exportiert werden soll"
+msgstr "Wählen Sie die Daten, die exportiert werden sollen"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:24
-#, fuzzy
 msgid "Export complete XLS for"
-msgstr "Exportiere vollständige LDIF-Datei für"
+msgstr "Exportiere vollständige XLS-Datei für"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
 msgid "Click here to save the complete LDAP database to a xls file"
-msgstr ""
-"Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
+msgstr "Hier klicken, um die gesamte LDAP-Datenbank in eine xls-Datei zu exportieren."
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
 msgid "Click here to save the LDAP Export to a xls file"
-msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
+msgstr "Hier klicken, um die exportierten Daten in eine xls-Datei zu speichern"
 
 #: plugins/addons/ldapmanager/class_exportxls.inc:7
-#, fuzzy
-msgid "XLS export"
-msgstr "LDIF exportieren"
-
-#: plugins/addons/ldapmanager/class_exportxls.inc:35
-#, fuzzy
-msgid "You've no permission to do XLS exports."
-msgstr ""
-"Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
+msgid "XLS import"
+msgstr "XLS-Import"
 
 #: plugins/addons/logview/class_logview.inc:6
 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:48
-#: plugins/addons/logview/class_logview.inc:138
+#: 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 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:57
-#: plugins/addons/logview/class_logview.inc:71
-#: plugins/addons/logview/class_logview.inc:210
+#: 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:81
+#: plugins/addons/logview/class_logview.inc:118
 msgid "one hour"
 msgstr "eine Stunde"
 
-#: plugins/addons/logview/class_logview.inc:81
+#: plugins/addons/logview/class_logview.inc:118
 msgid "6 hours"
 msgstr "6 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/logview/class_logview.inc:119
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/logview/class_logview.inc:119
 msgid "24 hours"
 msgstr "24 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:83
+#: plugins/addons/logview/class_logview.inc:120
 msgid "2 days"
 msgstr "2 Tage"
 
-#: plugins/addons/logview/class_logview.inc:83
+#: plugins/addons/logview/class_logview.inc:120
 msgid "one week"
 msgstr "eine Woche"
 
-#: plugins/addons/logview/class_logview.inc:84
+#: plugins/addons/logview/class_logview.inc:121
 msgid "2 weeks"
 msgstr "2 Wochen"
 
-#: plugins/addons/logview/class_logview.inc:84
+#: plugins/addons/logview/class_logview.inc:121
 msgid "one month"
 msgstr "ein Monat"
 
-#: plugins/addons/logview/class_logview.inc:135
-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"
@@ -4231,44 +4232,203 @@ msgstr "Nachricht"
 msgid "System log view"
 msgstr "Systemprotokolle"
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:23
+msgid "Mail queue"
+msgstr "Mail-Warteschlange"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:53
+msgid ""
+"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
+"specified."
+msgstr ""
+"Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag "
+"'MAILQUEUE_QUERY_COMMAND' wurde nicht gefunden."
+
+#: 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:251
+msgid "up"
+msgstr "auf"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:253
+msgid "down"
+msgstr "ab"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:296
+msgid "no limit"
+msgstr "keine Beschränkung"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:301
+msgid "hours"
+msgstr "Stunden"
+
+#: 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:15
+msgid "Select a server"
+msgstr "Wählen Sie einen Server"
+
+#: 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: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:54
+msgid "ID"
+msgstr "ID"
+
+#: plugins/addons/mailqueue/contents.tpl:57
+msgid "Arrival"
+msgstr "Ankunft"
+
+#: plugins/addons/mailqueue/contents.tpl:59
+msgid "Recipient"
+msgstr "Empfänger"
+
+#: 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:161
+#: 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:266
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:267
+#: plugins/admin/groups/class_groupGeneric.inc:285
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:272
+#: plugins/admin/groups/class_groupGeneric.inc:290
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:606
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: 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."
+msgstr "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:616
+#: plugins/admin/groups/class_groupGeneric.inc:636
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -4276,8 +4436,8 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:627
-#: plugins/admin/groups/class_groupGeneric.inc:634
+#: 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."
 
@@ -4289,19 +4449,19 @@ msgstr "Prim
 msgid "Select mail server to place user on"
 msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
 
-#: plugins/admin/groups/mail.tpl:66
+#: plugins/admin/groups/mail.tpl:63
 msgid "IMAP shared folders"
 msgstr "IMAP Austausch-Ordner"
 
-#: plugins/admin/groups/mail.tpl:70
+#: plugins/admin/groups/mail.tpl:67
 msgid "Default permission"
 msgstr "Standard-Berechtigungen"
 
-#: plugins/admin/groups/mail.tpl:79
+#: plugins/admin/groups/mail.tpl:76
 msgid "Member permission"
 msgstr "Mitglieder-Berechtigungen"
 
-#: plugins/admin/groups/mail.tpl:94
+#: plugins/admin/groups/mail.tpl:88
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
@@ -4324,51 +4484,51 @@ msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:80
-#: html/getxls.php:212
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:273
+#: 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:279
-#: plugins/admin/groups/class_groupManagement.inc:305
+#: 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:353
+#: plugins/admin/groups/class_groupManagement.inc:354
 msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/applications/class_applicationManagement.inc:337
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: 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:362
-#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/applications/class_applicationManagement.inc:338
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/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:372
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:345
-#: plugins/admin/ogroups/class_ogroupManagement.inc:481
-#: plugins/gofon/reports/contents.tpl:34
+#: plugins/admin/applications/class_applicationManagement.inc:348
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Anwendung"
@@ -4378,19 +4538,19 @@ msgid "Groupname"
 msgstr "Name der Gruppe"
 
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:687
+#: 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:390
+#: 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:391
-#: plugins/admin/applications/class_applicationManagement.inc:359
-#: plugins/admin/ogroups/class_ogroupManagement.inc:395
+#: plugins/admin/groups/class_groupManagement.inc:390
+#: plugins/admin/applications/class_applicationManagement.inc:362
+#: 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."
 
@@ -4406,52 +4566,51 @@ 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:179
+#: 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:244
+#: 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:245
+#: 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:613
+#: 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:646
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+#: 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:650
+#: plugins/admin/groups/class_groupMail.inc:659
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
@@ -4459,6 +4618,10 @@ msgstr "Bitte w
 msgid "Object"
 msgstr "Objekt"
 
+#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+msgid "Choose"
+msgstr "Wählen"
+
 #: plugins/admin/groups/acl.tpl:17
 msgid "Apply this acl only for users own entries"
 msgstr "Anwenden dieser Zugriffsregel nur auf Einträge des Eigentümers"
@@ -4467,15 +4630,11 @@ msgstr "Anwenden dieser Zugriffsregel nur auf Eintr
 msgid "Used applications"
 msgstr "Verwendete Anwendungen"
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Parameter bearbeiten"
+#: plugins/admin/groups/application.tpl:6
+msgid "Seperator"
+msgstr "Feldtrenner"
 
 #: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Optionale Anwendungsparameter bearbeiten"
-
-#: plugins/admin/groups/application.tpl:21
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
@@ -4483,20 +4642,20 @@ msgstr "Verf
 msgid "Select users to add"
 msgstr "Wählen Sie die hinzuzufügenden Benutzer"
 
-#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/groups/group_objects.tpl:29
 msgid "Display users of department"
 msgstr "Zeige die Benutzer der Abteilung"
 
-#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/groups/group_objects.tpl:39
 #: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
 
-#: plugins/admin/groups/class_groupAcl.inc:55
+#: plugins/admin/groups/class_groupAcl.inc:58
 msgid "This 'dn' is no acl container."
 msgstr "Diese 'dn' enthält keine Zugriffserweiterungen."
 
-#: plugins/admin/groups/class_groupAcl.inc:200
+#: plugins/admin/groups/class_groupAcl.inc:203
 msgid "All fields are writeable"
 msgstr "Alle Felder sind änderbar"
 
@@ -4512,14 +4671,13 @@ msgstr "UNIX-Name der Gruppe"
 msgid "Descriptive text for this group"
 msgstr "Beschreibender Text für diese Gruppe"
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:24
 msgid "Choose subtree to place group in"
 msgstr "Wählen Sie den Unterbaum, in den die Gruppe eingepflegt werden soll"
 
 #: plugins/admin/groups/generic.tpl:36
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
+msgstr "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
 #: plugins/admin/groups/generic.tpl:36
 msgid "Force GID"
@@ -4537,15 +4695,15 @@ msgstr "Ausw
 msgid "in domain"
 msgstr "in der Domain"
 
-#: plugins/admin/groups/generic.tpl:66
+#: plugins/admin/groups/generic.tpl:67
 msgid "Members are in a phone pickup group"
 msgstr "Mitglieder sind in einer Übernahme-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:77
+#: plugins/admin/groups/generic.tpl:80
 msgid "Members are in a nagios group"
 msgstr "Mitglieder sind in einer Nagios-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:92
+#: plugins/admin/groups/generic.tpl:96
 msgid "Group members"
 msgstr "Gruppenmitglieder"
 
@@ -4553,15 +4711,27 @@ msgstr "Gruppenmitglieder"
 msgid "Folder administrators"
 msgstr "Ordner-Administratoren"
 
-#: plugins/admin/groups/class_groupApplication.inc:61
+#: plugins/admin/groups/mail_admins.tpl:24
+msgid "Select a specific department"
+msgstr "Wählen Sie eine bestimmte Abteilung"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
+#: 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:69
+#: plugins/admin/groups/class_groupApplication.inc:210
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:70
+#: plugins/admin/groups/class_groupApplication.inc:211
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -4569,11 +4739,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:72
+#: plugins/admin/groups/class_groupApplication.inc:213
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:73
+#: plugins/admin/groups/class_groupApplication.inc:214
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -4581,22 +4751,44 @@ 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:107
+#: 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:143
+#: 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:278
+#: 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:379
+msgid "application"
+msgstr "Anwendung"
+
+#: 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."
+msgstr ""
+"Die Einstellung 'KDE_APPLICATIONS_MENU' ist nicht in ihrer gosa.conf "
+"vorhanden."
+
+#: 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
-msgid "The application named %s is no longer available and has been removed."
+msgid ""
+"The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not "
+"accessable."
 msgstr ""
-"Die Applikation mit dem Namen %s ist nicht mehr verfügbar und wurde aus der "
-"Liste entfernt."
+"Auf die für 'KDE_APPLICATIONS_MENU' angegebene Datei '%s' kann nicht "
+"zugegriffen werden."
 
 #: plugins/admin/users/password.tpl:2
 msgid ""
@@ -4613,7 +4805,6 @@ msgid "Creating a new user using templates"
 msgstr "Erzeugen eines neuen Benutzer aus einer Vorlage"
 
 #: plugins/admin/users/template.tpl:6
-#, fuzzy
 msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
@@ -4624,13 +4815,13 @@ 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:1010
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:1028
+#: plugins/admin/systems/class_systemManagement.inc:705
 msgid "Template"
 msgstr "Vorlage"
 
 #: plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:387
+#: plugins/admin/fai/class_faiManagement.inc:398
 #: plugins/admin/fai/faiPackageNew.tpl:65
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4648,57 +4839,57 @@ msgid "User administration"
 msgstr "Benutzerverwaltung"
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:65 html/getxls.php:56 html/getxls.php:211
+#: plugins/admin/systems/printer.tpl:65 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:244
-#: plugins/admin/users/class_userManagement.inc:314
+#: plugins/admin/users/class_userManagement.inc:247
+#: plugins/admin/users/class_userManagement.inc:317
 msgid "You are not allowed to set this users password!"
 msgstr "Sie haben keine Berechtigung, das Passwort dieses Benutzers zu setzen!"
 
-#: plugins/admin/users/class_userManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:353
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Sie löschen gerade den Benutzer %s."
 
-#: plugins/admin/users/class_userManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:387
 msgid "You are not allowed to delete this user!"
 msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen!"
 
-#: plugins/admin/users/class_userManagement.inc:485
+#: plugins/admin/users/class_userManagement.inc:488
 #: plugins/admin/systems/class_workstationStartup.inc:49
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:555
+#: 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."
+msgstr "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:678
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -4707,55 +4898,55 @@ msgstr "Passwort"
 msgid "Username"
 msgstr "Benutzername"
 
-#: plugins/admin/users/class_userManagement.inc:691
+#: 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:722
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:727
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:727
+#: plugins/admin/users/class_userManagement.inc:731
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/users/class_userManagement.inc:735
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/users/class_userManagement.inc:737
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:735
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/users/class_userManagement.inc:740
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:737
+#: 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:792
+#: plugins/admin/users/class_userManagement.inc:800
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:807
 msgid "Offline"
 msgstr "inaktiv"
 
@@ -4809,8 +5000,7 @@ msgstr "Zeige UNIX-Benutzer"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
-msgstr ""
-"Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
+msgstr "Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
@@ -4834,11 +5024,20 @@ msgstr "Zeige Proxy-Benutzer"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:354
+#: plugins/admin/applications/class_applicationManagement.inc:357
 msgid "Application name"
 msgstr "Name der Anwendung"
 
-#: plugins/admin/applications/generic.tpl:12
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
+msgstr "Angezeigter Name"
+
+#: plugins/admin/applications/generic.tpl:13
+msgid "Application name to be displayed (i.e. below icons)"
+msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
+
+#: plugins/admin/applications/generic.tpl:17
 #: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
 #: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
@@ -4846,92 +5045,82 @@ msgstr "Name der Anwendung"
 msgid "Execute"
 msgstr "Ausführen"
 
-#: plugins/admin/applications/generic.tpl:14
+#: plugins/admin/applications/generic.tpl:19
 msgid "Path and/or binary name of application"
 msgstr "Pfad und/oder Name der Anwendung"
 
-#: plugins/admin/applications/generic.tpl:18
-#: plugins/gofon/macro/generic.tpl:10
-msgid "Display name"
-msgstr "Angezeigter Name"
-
-#: plugins/admin/applications/generic.tpl:20
-msgid "Application name to be displayed (i.e. below icons)"
-msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
-
-#: plugins/admin/applications/generic.tpl:35
+#: plugins/admin/applications/generic.tpl:34
 msgid "Choose subtree to place application in"
 msgstr "Wählen Sie den Teilbaum, in den die Anwendung plaziert werden soll."
 
-#: plugins/admin/applications/generic.tpl:46
+#: plugins/admin/applications/generic.tpl:48
 msgid "Icon"
 msgstr "Symbol"
 
-#: plugins/admin/applications/generic.tpl:51
+#: plugins/admin/applications/generic.tpl:56
 msgid "Update"
 msgstr "Anwenden"
 
-#: plugins/admin/applications/generic.tpl:51
+#: plugins/admin/applications/generic.tpl:56
 msgid "Reload picture from LDAP"
 msgstr "Bild neu laden"
 
-#: plugins/admin/applications/generic.tpl:62
+#: plugins/admin/applications/generic.tpl:70
 msgid "Only executable for members"
 msgstr "Nur ausführbar für Gruppen-Mitglieder"
 
-#: plugins/admin/applications/generic.tpl:64
+#: plugins/admin/applications/generic.tpl:72
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
-#: plugins/admin/applications/generic.tpl:68
+#: plugins/admin/applications/generic.tpl:76
 msgid "Place icon on members desktop"
 msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:71
+#: plugins/admin/applications/generic.tpl:79
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/applications/generic.tpl:92
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Upload"
 msgstr "Hochladen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:47
+#: plugins/admin/applications/class_applicationParameters.inc:50
 msgid "Remove options"
 msgstr "Optionen entfernen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:48
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 "Diese Anwendung besitzt Optionen. Sie können diese durch Betätigen der "
 "Schaltfläche unten entfernen."
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
+#: plugins/admin/applications/class_applicationParameters.inc:53
 msgid "Create options"
 msgstr "Optionen aktivieren"
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
+#: plugins/admin/applications/class_applicationParameters.inc:54
+msgid "This application has options disabled. You can enable them by clicking below."
 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:87
+#: plugins/admin/applications/class_applicationParameters.inc:91
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/admin/applications/class_applicationParameters.inc:91
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Standardwert"
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/admin/applications/class_applicationParameters.inc:102
 msgid "Add option"
 msgstr "Option hinzufügen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
+#: 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."
@@ -4972,58 +5161,56 @@ msgstr "Regul
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
+#: plugins/admin/applications/class_applicationManagement.inc:250
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
+#: plugins/admin/applications/class_applicationManagement.inc:256
+#: plugins/admin/applications/class_applicationManagement.inc:282
 msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/applications/class_applicationManagement.inc:330
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:82
-#, fuzzy
+#: plugins/admin/applications/class_applicationGeneric.inc:106
 msgid "no example"
-msgstr "unvollständig"
+msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:97
+#: 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:213
+#: 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:294
+#: 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:299
+#: 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:303
+#: 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."
+msgstr "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:307
+#: 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:316
+#: plugins/admin/applications/class_applicationGeneric.inc:344
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
@@ -5081,31 +5268,29 @@ msgstr "Einleitende Telefonnummer dieses Unterbaums"
 
 #: plugins/admin/departments/generic.tpl:63
 msgid "Base facsimile telephone number of this subtree"
-msgstr "Einleitende FAX-Nummer dieses Unterbaums"
+msgstr "Einleitende Fax-Nummer dieses Unterbaums"
 
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
-#, fuzzy
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
 "check if your really want to do this since there is no way for GOsa to get "
 "your data back."
 msgstr ""
-"Dies umfasst <b>alle</b> Konten, System- und Setup-Informationen Bitte "
+"Dies umfasst <b>alle</b> Konten, System- und Setup-Informationen. Bitte "
 "prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, die Daten "
 "wiederherzustellen. "
 
 #: plugins/admin/departments/remove.tpl:10 plugins/admin/systems/remove.tpl:10
 #: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
-"Eine Sicherung der LDAP-Datenbank bietet sich an. Wenn Sie bereit sind, "
-"drücken Sie <i>Beenden</i> um Fortzufahren oder <i>Abbrechen</i>, um den "
-"Vorgang zu beenden."
+"Eine Sicherung der LDAP-Datenbank bietet sich an. Wenn Sie dies erledigt "
+"haben, drücken Sie <i>Entfernen</i> um Fortzufahren oder <i>Abbrechen</i>, "
+"um den Vorgang abzubrechen."
 
 #: plugins/admin/departments/headpage.tpl:6
 msgid "List of departments"
@@ -5135,24 +5320,23 @@ msgstr "Abteilungsverwaltung"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Departments"
 msgstr "Abteilungen"
 
 #: plugins/admin/departments/class_departmentManagement.inc:185
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:175
+#: 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."
+msgstr "Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
 
 #: plugins/admin/departments/class_departmentManagement.inc:202
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:192
+#: 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:279
-#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/admin/fai/class_faiManagement.inc:434
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
@@ -5164,79 +5348,74 @@ msgstr "Neue Abteilung erstellen"
 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:297
+#: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_departmentManagement.inc:316
-#: plugins/admin/fai/class_faiManagement.inc:492
-msgid "department"
-msgstr "Abteilung"
-
-#: plugins/admin/departments/class_departmentManagement.inc:393
+#: plugins/admin/departments/class_departmentManagement.inc:392
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: 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:147
-#: plugins/admin/departments/class_departmentGeneric.inc:149
+#: 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:157
+#: 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:162
+#: 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:163
+#: plugins/admin/departments/class_departmentGeneric.inc:173
 msgid " Please choose another name."
 msgstr "Bitte wählen Sie einen anderen Namen."
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
-#: plugins/admin/systems/class_terminalInfo.inc:178
+#: plugins/admin/systems/class_terminalInfo.inc:181
 msgid "present"
 msgstr "vorhanden"
 
-#: plugins/admin/systems/class_terminalInfo.inc:62
-#: plugins/admin/systems/class_terminalService.inc:136
-#: plugins/admin/systems/class_terminalStartup.inc:96
-#: plugins/admin/systems/class_workstationService.inc:121
-#: plugins/admin/systems/class_workstationStartup.inc:212
-#: plugins/admin/systems/class_terminalGeneric.inc:127
+#: plugins/admin/systems/class_terminalInfo.inc:65
+#: plugins/admin/systems/class_terminalService.inc:139
+#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_workstationService.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:215
+#: plugins/admin/systems/class_terminalGeneric.inc:130
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
-#: plugins/admin/systems/class_terminalInfo.inc:69
+#: plugins/admin/systems/class_terminalInfo.inc:72
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Dies ist ein virtuelles Terminal, deshalb können an dieser Stelle keine "
 "Informationen angezeigt werden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:92
 msgid "online"
 msgstr "aktiv"
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "running"
 msgstr "läuft"
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not running"
 msgstr "läuft nicht"
 
-#: plugins/admin/systems/class_terminalInfo.inc:152
+#: plugins/admin/systems/class_terminalInfo.inc:155
 msgid "unknown status"
 msgstr "unbekannter Status"
 
-#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_terminalInfo.inc:173
 msgid "offline"
 msgstr "inaktiv"
 
@@ -5252,38 +5431,37 @@ msgstr "IP-Adresse"
 msgid "MAC-address"
 msgstr "MAC-Adresse"
 
-#: plugins/admin/systems/class_servService.inc:259
+#: plugins/admin/systems/class_servService.inc:264
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:51
 msgid "This 'dn' has no network features."
 msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
+#: plugins/admin/systems/class_winGeneric.inc:142
+#: plugins/admin/systems/class_componentGeneric.inc:113
 msgid "The required field 'Component name' is not set."
 msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
+#: plugins/admin/systems/class_winGeneric.inc:156
+#: plugins/admin/systems/class_componentGeneric.inc:126
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:257
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:211
-#: plugins/admin/systems/class_printGeneric.inc:438
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
+#: plugins/admin/systems/class_winGeneric.inc:166
+#: plugins/admin/systems/class_terminalGeneric.inc:260
+#: plugins/admin/systems/class_servGeneric.inc:183
+#: plugins/admin/systems/class_workstationGeneric.inc:221
+#: plugins/admin/systems/class_printGeneric.inc:458
+#: plugins/admin/systems/class_componentGeneric.inc:136
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-"Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
+msgstr "Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -5419,6 +5597,10 @@ msgstr "Protokoll-Dienst"
 msgid "Print Service"
 msgstr "Druck-Dienst"
 
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
+msgstr "Mail-Server"
+
 #: plugins/admin/systems/class_terminalService.inc:83
 #: plugins/admin/systems/class_workstationService.inc:68
 msgid "default"
@@ -5449,22 +5631,22 @@ msgstr "Windows RDP"
 msgid "ICA client"
 msgstr "Citrix Metaframe"
 
-#: plugins/admin/systems/class_terminalService.inc:184
-#: plugins/admin/systems/class_workstationService.inc:168
+#: plugins/admin/systems/class_terminalService.inc:187
+#: plugins/admin/systems/class_workstationService.inc:171
 msgid "Choose the phone located at the current terminal"
 msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:233
-#: plugins/admin/systems/class_workstationService.inc:238
+#: plugins/admin/systems/class_terminalService.inc:251
+#: plugins/admin/systems/class_terminalService.inc:256
+#: plugins/admin/systems/class_workstationService.inc:236
+#: plugins/admin/systems/class_workstationService.inc:241
 msgid "Please specify a valid VSync range."
 msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:248
-#: plugins/admin/systems/class_workstationService.inc:253
+#: plugins/admin/systems/class_terminalService.inc:266
+#: plugins/admin/systems/class_terminalService.inc:271
+#: plugins/admin/systems/class_workstationService.inc:251
+#: plugins/admin/systems/class_workstationService.inc:256
 msgid "Please specify a valid HSync range."
 msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 
@@ -5473,31 +5655,30 @@ msgstr "Bitte geben Sie einen g
 msgid "Select objects to add"
 msgstr "Wählen Sie die hinzuzufügenden Objekte"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:33
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr "Zeige die Objekte der Abteilung"
-
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:41
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:30
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 #: plugins/admin/fai/headpage.tpl:47 plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiProfileEntry.tpl:56
-#: 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:45
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 #: plugins/admin/fai/headpage.tpl:51 plugins/admin/fai/faiProfileEntry.tpl:60
-#: 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"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/printerPPDDialog.tpl:6
 msgid "Select"
 msgstr "Auswahl"
 
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:48
+msgid "Close"
+msgstr "Schliessen"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -5577,8 +5758,7 @@ msgstr "Treiber"
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-"Wählen Sie den Treiber, der von der installierten Grafikkarte benötigt wird."
+msgstr "Wählen Sie den Treiber, der von der installierten Grafikkarte benötigt wird."
 
 #: plugins/admin/systems/workstationService.tpl:96
 #: plugins/admin/systems/terminalService.tpl:96
@@ -5637,72 +5817,79 @@ msgstr "Bilderfassungsdienste bereitstellen"
 
 #: plugins/admin/systems/class_workstationStartup.inc:197
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr ""
-"Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
+msgstr "Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:248
+#: plugins/admin/systems/class_workstationStartup.inc:251
 msgid ""
 "There is already a profile in your selection that contain partition table "
-"configuratons."
+"configurations."
 msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#: plugins/admin/systems/class_printerPPDDialog.inc:64
 #, php-format
-msgid "Can't open '%s', ppd settings reseted."
-msgstr ""
+msgid "Can't open '%s', ppd settings resetted."
+msgstr "Kann '%s' nicht öffnen, PPD-Einstellungen wurden  zurückgesetzt."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:100
+#: plugins/admin/systems/class_printerPPDDialog.inc:105
 #, php-format
-msgid "Cab't create folder '%s' for the uploaded ppd file."
+msgid ""
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
 msgstr ""
+"Der in Ihrer 'gosa.conf' angegebene PPD-Pfad (PPD_PATH) '%s' ist ungültig - "
+"kann daher keine ppd-Informationen lesen."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:106
+msgid "Can't get ppd informations."
+msgstr "Kann PPD-Information nicht lesen"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:122
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr "Kann Verzeichnis '%s' für hochgeladene PPD-Datei nicht anlegen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:113
-#, fuzzy, php-format
+#: plugins/admin/systems/class_printerPPDDialog.inc:135
+#, php-format
 msgid "There is already a ppd file for this kind of printer."
-msgstr ""
-"Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
+msgstr "Der von Ihnen gewählte Drucker-Typ verfügt bereits über eine PPD-Datei."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:120
+#: plugins/admin/systems/class_printerPPDDialog.inc:143
 #, php-format
-msgid "Can't save file '%s'"
-msgstr ""
+msgid "Can't save file '%s'."
+msgstr "Kann Datei '%s' nicht speichern."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:136
-#: plugins/admin/systems/class_printerPPDDialog.inc:139
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:162
+#: plugins/admin/systems/class_printerPPDDialog.inc:165
 msgid "Please specify a valid ppd file."
-msgstr "Bitte geben Sie eine gültige ID ein!"
+msgstr "Bitte geben Sie eine gültige PPD-Datei an."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:189
 msgid "Please select a valid ppd."
-msgstr "Bitte wählen Sie eine gültige Datei."
+msgstr "Bitte wählen Sie eine gültige PPD."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/systems/class_printerPPDDialog.inc:313
 #: plugins/admin/fai/faiPackage.tpl:41
 msgid "Section"
 msgstr "Section"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:320
-#: plugins/admin/systems/class_printerPPDDialog.inc:323
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:363
+#: plugins/admin/systems/class_printerPPDDialog.inc:366
 msgid "True"
 msgstr "wahr"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:321
-#: plugins/admin/systems/class_printerPPDDialog.inc:324
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:364
+#: plugins/admin/systems/class_printerPPDDialog.inc:367
 msgid "False"
 msgstr "falsch"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:329
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
-msgstr ""
+msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
 
-#: plugins/admin/systems/server.tpl:6
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Server-Name"
 
@@ -5732,78 +5919,76 @@ msgstr "textuell"
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:89
-#: plugins/admin/systems/class_servGeneric.inc:59
-#: plugins/admin/ogroups/class_termgroup.inc:59
+#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:62
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:93
-#: plugins/admin/systems/class_terminalGeneric.inc:105
-#: plugins/admin/systems/class_terminalGeneric.inc:117
-#: plugins/admin/systems/class_servGeneric.inc:63
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/systems/class_servGeneric.inc:87
-#: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:63
-#: plugins/admin/ogroups/class_termgroup.inc:75
-#: plugins/admin/ogroups/class_termgroup.inc:87
+#: plugins/admin/systems/class_terminalGeneric.inc:96
+#: plugins/admin/systems/class_terminalGeneric.inc:108
+#: plugins/admin/systems/class_terminalGeneric.inc:120
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/ogroups/class_termgroup.inc:66
+#: plugins/admin/ogroups/class_termgroup.inc:78
+#: plugins/admin/ogroups/class_termgroup.inc:90
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:101
-#: plugins/admin/systems/class_servGeneric.inc:71
-#: plugins/admin/ogroups/class_termgroup.inc:71
+#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:74
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Es ist kein REBOOTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:113
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/ogroups/class_termgroup.inc:83
+#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:86
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:123
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:123
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:146
-#: plugins/admin/systems/class_servGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:128
-#: plugins/admin/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:149
+#: plugins/admin/systems/class_servGeneric.inc:117
+#: plugins/admin/systems/class_workstationGeneric.inc:137
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:240
+#: plugins/admin/systems/class_terminalGeneric.inc:243
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:244
+#: plugins/admin/systems/class_terminalGeneric.inc:247
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
 #: plugins/admin/systems/printerPPDDialog.tpl:1
-#, fuzzy
 msgid "Printer driver"
-msgstr "Drucker"
+msgstr "Drucker-Treiber"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
 msgid "New driver"
-msgstr "Neuer Server"
+msgstr "Neuer Treiber"
 
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
@@ -5859,30 +6044,29 @@ 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 ""
-"Zusätzliche Module hinzufügen, die während des Starts geladen werden sollen"
+msgstr "Zusätzliche Module hinzufügen, die während des Starts geladen werden sollen"
 
 #: plugins/admin/systems/phone.tpl:6
 msgid "Phone name"
 msgstr "Telefon-Name"
 
-#: plugins/admin/systems/class_servGeneric.inc:49
+#: plugins/admin/systems/class_servGeneric.inc:52
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:166
 msgid "The required field 'Server name' is not set."
 msgstr "Das benötigte Feld 'Server-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:173
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
@@ -5898,7 +6082,7 @@ msgstr "Terminal-Name"
 
 #: plugins/admin/systems/terminal.tpl:36
 #: plugins/admin/systems/workstation.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modus"
 
@@ -5943,19 +6127,18 @@ msgstr "Zeit-Server"
 #: plugins/admin/systems/terminal.tpl:84
 #: plugins/admin/systems/workstation.tpl:64
 msgid "Choose server to use for synchronizing time"
-msgstr ""
-"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+msgstr "Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
 
 #: plugins/admin/systems/terminal.tpl:103
 #: plugins/admin/systems/workstation.tpl:82
 msgid "Select action to execute for this terminal"
 msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "DHCP-Dienst entfernen"
 
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
@@ -5963,11 +6146,11 @@ msgstr ""
 "Dieser Server besitzt aktivierte die DHCP-Funktionen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:39
 msgid "Add DHCP service"
 msgstr "DHCP Dienst hinzufügen"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_servDHCP.inc:40
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
@@ -5975,30 +6158,30 @@ msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten DHCP-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:157
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:168
+#: plugins/admin/systems/class_servDB.inc:134
+#: plugins/admin/systems/class_servDB.inc:150
+#: plugins/admin/systems/class_servDB.inc:160
+#: plugins/admin/systems/class_servDB.inc:165
+#: plugins/admin/systems/class_servDB.inc:171
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servDB.inc:137
+#: plugins/admin/systems/class_servDB.inc:140
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
 
-#: plugins/admin/systems/class_servDB.inc:141
+#: plugins/admin/systems/class_servDB.inc:144
 msgid "The sieve port needs to be numeric."
 msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servDB.inc:155
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr "Das angebene Kerberos-Passwort ist leer."
 
-#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:179
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
@@ -6018,9 +6201,8 @@ msgid "Details"
 msgstr "Details"
 
 #: plugins/admin/systems/printer.tpl:33
-#, fuzzy
 msgid "Printer location"
-msgstr "Drucker-Einstellungen"
+msgstr "Drucker-Standort"
 
 #: plugins/admin/systems/printer.tpl:37
 msgid "Printer URL"
@@ -6031,9 +6213,8 @@ msgid "Permissions"
 msgstr "Berechtigungen"
 
 #: plugins/admin/systems/printer.tpl:64
-#, fuzzy
 msgid "Users which are allowed to use this printer"
-msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
 #: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
 msgid "Add user"
@@ -6044,54 +6225,62 @@ msgid "Add group"
 msgstr "Gruppe hinzufügen"
 
 #: plugins/admin/systems/printer.tpl:80
-#, fuzzy
 msgid "Users which are allowed to administrate this printer"
-msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
 #: plugins/admin/systems/printer.tpl:81
 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:94
+#: 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:106
+#: 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:124
+#: plugins/admin/systems/class_workstationGeneric.inc:132
 msgid "Instant update"
 msgstr "Sofortiges Update"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:125
-#: plugins/admin/systems/class_workstationGeneric.inc:129
+#: 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:126
+#: 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:194
+#: 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:198
+#: 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."
 
@@ -6099,171 +6288,169 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:331
+#: plugins/admin/systems/class_systemManagement.inc:334
 msgid "You can't edit this object type yet!"
 msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
 
-#: plugins/admin/systems/class_systemManagement.inc:347
+#: plugins/admin/systems/class_systemManagement.inc:350
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
 "Passwort' eingegeben haben sind nicht identisch!"
 
-#: plugins/admin/systems/class_systemManagement.inc:360
+#: plugins/admin/systems/class_systemManagement.inc:363
 msgid "You are not allowed to set this systems password!"
-msgstr ""
-"Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
+msgstr "Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:404
+#: plugins/admin/systems/class_systemManagement.inc:407
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
-msgstr ""
-"Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
+msgstr "Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
 
-#: plugins/admin/systems/class_systemManagement.inc:410
-#: plugins/admin/systems/class_systemManagement.inc:474
-#: plugins/admin/fai/class_faiManagement.inc:207
-#: plugins/admin/fai/class_faiManagement.inc:246
+#: plugins/admin/systems/class_systemManagement.inc:413
+#: plugins/admin/systems/class_systemManagement.inc:477
+#: plugins/admin/fai/class_faiManagement.inc:210
+#: plugins/admin/fai/class_faiManagement.inc:249
 msgid "You are not allowed to delete this component!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/systems/class_systemManagement.inc:569
 msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:710
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:711
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:572
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:573
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:574
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_systemManagement.inc:579
+#: plugins/admin/systems/class_systemManagement.inc:582
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:583
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_systemManagement.inc:586
+#: plugins/admin/systems/class_systemManagement.inc:589
 msgid "System"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/fai/class_faiManagement.inc:462
+#: 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:623
+#: plugins/admin/systems/class_systemManagement.inc:625
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:626
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:628
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:627
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:628
+#: plugins/admin/systems/class_systemManagement.inc:630
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:629
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:630
+#: plugins/admin/systems/class_systemManagement.inc:632
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:631
+#: plugins/admin/systems/class_systemManagement.inc:633
 msgid "Fax Server"
-msgstr "FAX-Server"
+msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:632
+#: plugins/admin/systems/class_systemManagement.inc:634
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:658
+#: plugins/admin/systems/class_systemManagement.inc:660
 msgid "Set root password"
 msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/class_systemManagement.inc:704
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/ogroups/class_ogroupManagement.inc:488
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:705
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: 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:710
+#: plugins/admin/systems/class_systemManagement.inc:712
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:711
+#: plugins/admin/systems/class_systemManagement.inc:713
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:930
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:933
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:948
+#: plugins/admin/systems/class_systemManagement.inc:950
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:960
+#: plugins/admin/systems/class_systemManagement.inc:962
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/class_printGeneric.inc:186
-#: plugins/admin/systems/class_printGeneric.inc:207
-#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:194
+#: plugins/admin/systems/class_printGeneric.inc:215
+#: plugins/admin/systems/class_printGeneric.inc:218
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_printGeneric.inc:187
+#: plugins/admin/systems/class_printGeneric.inc:195
 msgid ""
 "This workstation has printer extension disabled. You can't enable it while "
 "'cn' is not present in entry. Possibly you are currently creating a new "
@@ -6274,12 +6461,12 @@ msgstr ""
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: plugins/admin/systems/class_printGeneric.inc:199
-#: plugins/admin/systems/class_printGeneric.inc:202
+#: plugins/admin/systems/class_printGeneric.inc:207
+#: plugins/admin/systems/class_printGeneric.inc:210
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_printGeneric.inc:200
+#: plugins/admin/systems/class_printGeneric.inc:208
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -6287,7 +6474,7 @@ msgstr ""
 "Diese Workstation besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:203
+#: plugins/admin/systems/class_printGeneric.inc:211
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -6295,7 +6482,7 @@ msgstr ""
 "Dieses Terminal besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:208
+#: plugins/admin/systems/class_printGeneric.inc:216
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -6303,7 +6490,7 @@ msgstr ""
 "Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:219
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -6311,55 +6498,62 @@ msgstr ""
 "Aktuell besitzt dieses Terminal keine aktivierten Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:222
+#: plugins/admin/systems/class_printGeneric.inc:230
 msgid "This 'dn' has no printer features."
 msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
 #: 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:372
+msgid "can't get ppd informations."
+msgstr "keine PPD-Informationen verfügbar"
+
+#: 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:366
+#: 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:428
+#: 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:555
-#: plugins/admin/systems/class_printGeneric.inc:557
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/systems/class_printGeneric.inc:584
+#: 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
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/admin/systems/class_servDNS.inc:33
+#: plugins/admin/systems/class_servDNS.inc:36
 msgid "Remove DNS service"
 msgstr "DNS-Dienst entfernen"
 
-#: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/class_servDNS.inc:37
+msgid "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "Dieser Server besitzt aktivierte die DNS-Funktionen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_servDNS.inc:39
 msgid "Add DNS service"
 msgstr "DNS-Dienst hinzufügen"
 
-#: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/class_servDNS.inc:40
+msgid "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten DNS-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
@@ -6372,27 +6566,27 @@ msgstr "Vorlage f
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
-#: plugins/admin/systems/class_servNfs.inc:101
+#: plugins/admin/systems/class_servNfs.inc:104
 msgid "Please specify a valid path for your setup."
 msgstr "Bitte geben Sie einen gültigen Pfad an."
 
-#: plugins/admin/systems/class_servNfs.inc:107
+#: plugins/admin/systems/class_servNfs.inc:110
 msgid "Please specify a valid name for your setup."
 msgstr "Bitte geben Sie einen gültigen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:110
+#: plugins/admin/systems/class_servNfs.inc:113
 msgid "Please specify a name for your setup."
 msgstr "Bitte geben Sie einen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:115
+#: plugins/admin/systems/class_servNfs.inc:118
 msgid "Description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:119
+#: plugins/admin/systems/class_servNfs.inc:122
 msgid "Path contains invalid characters."
 msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servNfs.inc:123
+#: plugins/admin/systems/class_servNfs.inc:126
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
@@ -6410,11 +6604,11 @@ msgstr "Administrator"
 
 #: plugins/admin/systems/servdb.tpl:26
 msgid "FAX database"
-msgstr "FAX-Datenbank"
+msgstr "Fax-Datenbank"
 
 #: plugins/admin/systems/servdb.tpl:30
 msgid "FAX DB user"
-msgstr "FAX-DB Benutzer"
+msgstr "Fax-DB Benutzer"
 
 #: plugins/admin/systems/servdb.tpl:42
 msgid "Asterisk management"
@@ -6456,27 +6650,31 @@ msgstr "Protokoll-Datenbank"
 msgid "Logging DB user"
 msgstr "Protokoll-DB Benutzer"
 
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Freigabe 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"
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid "Remove Kolab extension"
 msgstr "Kolab-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
@@ -6484,11 +6682,11 @@ msgstr ""
 "Dieser Server besitzt aktivierte die Kolab-Funtionen. Sie können diese durch "
 "einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid "Add Kolab service"
 msgstr "Kolab-Dienst hinzufügen"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
@@ -6496,119 +6694,119 @@ msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten Kolab-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servKolab.inc:146
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 "Berücksichtige %s Tage in der Vergangenheit beim Erstellen von Frei/Belegt-"
 "Listen"
 
-#: plugins/admin/systems/class_servKolab.inc:149
+#: plugins/admin/systems/class_servKolab.inc:152
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
 
-#: plugins/admin/systems/class_servKolab.inc:221
+#: plugins/admin/systems/class_servKolab.inc:224
 msgid "Future days in Free/Busy settings must be set."
 msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
 
-#: plugins/admin/systems/class_servKolab.inc:223
+#: plugins/admin/systems/class_servKolab.inc:226
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
 
-#: plugins/admin/systems/class_servKolab.inc:227
+#: plugins/admin/systems/class_servKolab.inc:230
 msgid "The given Quota settings value must be a number."
 msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/class_servKolab.inc:229
+#: plugins/admin/systems/class_servKolab.inc:232
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
 
-#: plugins/admin/systems/class_servKolab.inc:231
+#: plugins/admin/systems/class_servKolab.inc:234
 msgid "Future days must be a value."
 msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/class_servKolab.inc:235
+#: plugins/admin/systems/class_servKolab.inc:238
 msgid "No SMTP privileged networks set."
 msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
 
-#: plugins/admin/systems/class_servKolab.inc:239
+#: plugins/admin/systems/class_servKolab.inc:242
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
 
 #: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
+msgid "Advanced phone settings"
 msgstr "Erweiterte Telefon-Einstellungen"
 
-#: plugins/admin/systems/phonesettings.tpl:9
+#: plugins/admin/systems/phonesettings.tpl:6
 msgid "Phone type"
 msgstr "Telefon-Modell"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 msgid "Choose a phone type"
 msgstr "Wählen Sie das Telefon-Modell"
 
-#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/admin/systems/phonesettings.tpl:10
 msgid "refresh"
 msgstr "Aktualisieren"
 
-#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:32
 msgid "DTMF mode"
 msgstr "DTMF-Modus"
 
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 msgid "Default IP"
 msgstr "Standard IP-Adresse"
 
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
 msgid "Response timeout"
 msgstr "Wartezeit bis Antwort"
 
-#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/phonesettings.tpl:75
 msgid "Modus"
 msgstr "Modus"
 
-#: plugins/admin/systems/phonesettings.tpl:111
+#: plugins/admin/systems/phonesettings.tpl:106
 msgid "Authtype"
 msgstr "Authentifizierung"
 
-#: plugins/admin/systems/phonesettings.tpl:121
+#: plugins/admin/systems/phonesettings.tpl:116
 msgid "Secret"
 msgstr "Passwort"
 
-#: plugins/admin/systems/phonesettings.tpl:129
+#: plugins/admin/systems/phonesettings.tpl:124
 msgid "GoFonInkeys"
 msgstr "GOFon-Schlüssel (eingehend)"
 
-#: plugins/admin/systems/phonesettings.tpl:137
+#: plugins/admin/systems/phonesettings.tpl:132
 msgid "GoFonOutKeys"
 msgstr "GOFon-Schlüssel (ausgehend)"
 
-#: plugins/admin/systems/phonesettings.tpl:150
+#: plugins/admin/systems/phonesettings.tpl:145
 msgid "Account code"
 msgstr "Konto-Identifikation"
 
-#: plugins/admin/systems/phonesettings.tpl:158
+#: plugins/admin/systems/phonesettings.tpl:153
 msgid "Trunk lines"
 msgstr "Leitungen zusammenfassen"
 
-#: plugins/admin/systems/phonesettings.tpl:173
+#: plugins/admin/systems/phonesettings.tpl:168
 msgid "Hosts that are allowed to connect"
 msgstr "Erlaube diesen Rechnern die Verbindung"
 
-#: plugins/admin/systems/phonesettings.tpl:188
+#: plugins/admin/systems/phonesettings.tpl:183
 msgid "Hosts that are not allowed to connect"
 msgstr "Verbiete diesen Rechnern die Verbindung"
 
-#: plugins/admin/systems/phonesettings.tpl:210
+#: plugins/admin/systems/phonesettings.tpl:205
 msgid "MSN"
 msgstr "MSN"
 
@@ -6654,8 +6852,7 @@ msgstr "Frei/Belegt-Einstellungen"
 
 #: plugins/admin/systems/servkolab.tpl:102
 msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-"Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
+msgstr "Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
 
 #: plugins/admin/systems/servkolab.tpl:117
 msgid "SMTP privileged networks"
@@ -6735,8 +6932,7 @@ msgstr "Spool-Server"
 
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Spool-Dateien abgelegt werden"
+msgstr "Wählen Sie das NFS-Dateisystem, in dem die Spool-Dateien abgelegt werden"
 
 #: plugins/admin/systems/terminalService.tpl:212
 msgid "Select scanner driver to use"
@@ -6842,24 +7038,24 @@ msgid "User name of which terminal(s) are shown"
 msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
 
 #: plugins/admin/systems/password.tpl:2
-#, fuzzy
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in."
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
-"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
-"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
-"Benutzer ohne dieses Passwort nicht anmelden kann."
+"Um das root-Passwort des Terminals zu ändern, nutzen Sie die Felder unten. "
+"Die Änderungen werden beim nächsten Neustart wirksam. Merken Sie sich das "
+"Passwort, da eine Anmeldung ohne dieses Passwort nicht möglich ist."
 
 #: plugins/admin/systems/password.tpl:5
 msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
+"Lassen Sie die Felder leer, um das Passwort aus den Standard-Einträgen zu "
+"übernehmen."
 
 #: plugins/admin/systems/password.tpl:9
 msgid "Changing the password impinges on authentification only."
-msgstr ""
-"Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
+msgstr "Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
 
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
@@ -6909,13 +7105,13 @@ msgstr "Andere Netzwerk-Komponente"
 msgid "Create"
 msgstr "Anlegen"
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
 msgid "The required field 'MAC-address' is not set."
 msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
+#: plugins/admin/systems/class_componentGeneric.inc:119
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "The required field 'IP-address' is not set."
 msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
 
@@ -6945,29 +7141,29 @@ msgstr "W
 msgid "use debug mode for startup"
 msgstr "benutze Fehlersuch-Modus"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:102
+#: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/admin/systems/class_phoneGeneric.inc:177
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "yes"
 msgstr "ja"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/admin/systems/class_phoneGeneric.inc:177
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "no"
 msgstr "nein"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 msgid "Networksettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:213
+#: plugins/admin/systems/class_phoneGeneric.inc:216
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
@@ -6976,71 +7172,60 @@ msgstr ""
 "Das Telefon kann nicht entfernt werden, da es abhängige Benutzer gibt. Der "
 "erste Benutzer in der Liste ist '%s'."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:270
+#: plugins/admin/systems/class_phoneGeneric.inc:273
 msgid "The required field 'Phone name' is not set."
 msgstr "Das benötigte Feld 'Telefon-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
+#: plugins/admin/systems/class_phoneGeneric.inc:276
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
+#: plugins/admin/systems/class_phoneGeneric.inc:285
 msgid "Wrong IP format in field IP-address."
 msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:289
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
+msgstr "Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
 msgid "Select entries to add"
-msgstr "Wählen Sie die hinzuzufügenden Benutzer"
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
-#, fuzzy
-msgid ""
-"This menu allows you to select one or multiple entries to be added to the "
-"printer object for specific tasks. Having a great number of entries, you may "
-"want to use the range selectors below."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen Benutzer oder Gruppen zu dem Drucker "
-"hinzuzufügen oder zu entfernen. Bei einer großen Zahl von Benutzern bietet "
-"sich die Verwendung der Bereichsauswahl an."
+msgstr "Wählen Sie die hinzuzufügenden Einträge"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 msgid "Display members of department"
 msgstr "Zeige die Mitglieder der Abteilung"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
 msgid "Display members matching"
 msgstr "Zeige die Mitglieder, auf die Folgendes passt"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
 msgid "Regular expression for matching member names"
 msgstr "Regulärer Ausdruck zum Erkennen von Mitgliedsnamen"
 
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
+msgstr "Auswahl der Drucker-PPD"
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:148
+#: plugins/admin/ogroups/tabs_ogroups.inc:151
 msgid "Phone queue"
 msgstr "Warteschlange"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:84
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:131
 msgid "Terminals"
 msgstr "Arbeitsplätze"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/class_mailogroup.inc:41
+msgid "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 "Diese Gruppe besitzt aktivierte Mail-Erweiterungen. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 "Diese Gruppe besitz keine Mail-Erweiterungen. Sie können diese aktivieren, "
 "wenn Sie auf die untere Schaltfläche klicken."
@@ -7097,6 +7282,10 @@ msgstr "Zeige Netzwerk-Drucker"
 msgid "Select to see phones"
 msgstr "Wählen, um die 'VOIP Telefone' zu sehen"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr "Zeige die Objekte der Abteilung"
+
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -7111,62 +7300,61 @@ 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:124
+#: 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:234
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:236
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:237
+#: plugins/admin/ogroups/class_ogroup.inc:245
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:238
+#: plugins/admin/ogroups/class_ogroup.inc:246
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:239
+#: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/ogroups/class_ogroup.inc:248
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:241
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:250
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:243
+#: plugins/admin/ogroups/class_ogroup.inc:251
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:252
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:251
+#: plugins/admin/ogroups/class_ogroup.inc:259
 msgid "and"
 msgstr "und"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:410
 msgid "Non existing dn: "
 msgstr "Unbekannte dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:533
+#: 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!"
+msgstr "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
@@ -7177,9 +7365,9 @@ msgstr "Objektgruppen"
 msgid "UNIX accounts"
 msgstr "Unix-Konten"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:128
-#: html/getxls.php:134 html/getxls.php:151 html/getxls.php:213
-#: html/getxls.php:269
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
 msgid "Servers"
 msgstr "Server"
 
@@ -7191,25 +7379,25 @@ msgstr "Thin Clients"
 msgid "Workstations"
 msgstr "Workstations"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#: 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:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+#: 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:362
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "Create new object group"
 msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Name of object groups"
 msgstr "Name der Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/admin/ogroups/class_ogroupManagement.inc:440
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Objektgruppe"
@@ -7218,7 +7406,7 @@ msgstr "Objektgruppe"
 msgid "Name of the group"
 msgstr "Name der Gruppe"
 
-#: plugins/admin/ogroups/generic.tpl:32
+#: plugins/admin/ogroups/generic.tpl:33
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
@@ -7308,22 +7496,21 @@ msgstr "zuf
 msgid "round robin with memory"
 msgstr "nacheinander (mit Speicher)"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:110
+#: plugins/admin/ogroups/class_phonequeue.inc:113
 msgid "Remove the phone queue from this Account"
 msgstr "Warteschlange von diesem Konto entfernen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:111
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:114
+msgid "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 "Diese Gruppe besitzt aktivierte die Warteschlangen-Erweiterung. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:116
 msgid "Create phone queue"
 msgstr "Warteschlange erstellen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
+#: plugins/admin/ogroups/class_phonequeue.inc:117
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
@@ -7352,24 +7539,14 @@ msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:225
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:244
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-#: plugins/gofon/macro/class_gofonMacro.inc:88
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:222
-#, fuzzy
-msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). Your settings "
-"can't be saved to asterisk database."
+msgid "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
-"Momentan ist kein Asterisk-Server definiert. Wahrscheinlich fehlt Ihnen ein "
-"Server, der das Asterisk-Management (goFonServer) enthält.\n"
-"Ihre Einstellungen können daher nicht in der Asterisk-Datenbank gespeichert "
-"werden."
+"Im Moment ist kein Asterisk-Server definiert. Ihre Einstellungen können "
+"nicht gespeichert werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:234
-#, fuzzy, php-format
+#: 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 "
 "error."
@@ -7377,41 +7554,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:249
-#: plugins/admin/ogroups/class_phonequeue.inc:623
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#: plugins/gofon/macro/class_gofonMacro.inc:199
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:354
+#: 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: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:280
-#: plugins/admin/ogroups/class_phonequeue.inc:494
-#: plugins/admin/ogroups/class_phonequeue.inc:659
+#: 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:524
-#: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:396
+#: plugins/admin/ogroups/class_phonequeue.inc: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: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:613
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:77
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:283
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
-#: plugins/gofon/macro/class_gofonMacro.inc:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:343
+#: 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: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 "
@@ -7584,9 +7761,8 @@ msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
 #: plugins/admin/fai/remove.tpl:7
-#, fuzzy
 msgid ""
-"This includes 'all' object informations. Please double check if your really "
+"This includes 'all' object information. Please double check if your really "
 "want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 "Dies umfasst <b>alle</b> Objekt-Informationen Bitte prüfen Sie genau, da es "
@@ -7604,128 +7780,128 @@ msgstr "Partitions-Eintr
 msgid "Add partition"
 msgstr "Partition hinzufügen"
 
-#: 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:201
+#: plugins/admin/fai/class_faiManagement.inc:204
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
-msgstr ""
-"Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
+msgstr "Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:428
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:444
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:433
+#: plugins/admin/fai/class_faiManagement.inc:444
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:447
 msgid "New scripts"
 msgstr "Neue Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:436
+#: plugins/admin/fai/class_faiManagement.inc:447
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:450
 msgid "New hooks"
 msgstr "Neue Hooks"
 
-#: plugins/admin/fai/class_faiManagement.inc:439
+#: plugins/admin/fai/class_faiManagement.inc:450
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:453
 msgid "New variables"
 msgstr "Neue Variablen"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:453
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:456
 msgid "New templates"
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:456
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:459
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:459
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:466
+#: plugins/admin/fai/class_faiManagement.inc:477
 msgid "Name of FAI class"
 msgstr "Name der FAI-Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:467
+#: plugins/admin/fai/class_faiManagement.inc:478
 msgid "Class type"
 msgstr "Typ der Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/admin/fai/class_faiManagement.inc:482
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_faiManagement.inc:472
+#: plugins/admin/fai/class_faiManagement.inc:483
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/fai/class_faiManagement.inc:514
-#: plugins/admin/fai/class_faiManagement.inc:515
-#: plugins/admin/fai/class_faiProfile.inc:158
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiManagement.inc: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:521
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: 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:528
-#: plugins/admin/fai/class_faiManagement.inc:529
+#: plugins/admin/fai/class_faiManagement.inc:539
+#: plugins/admin/fai/class_faiManagement.inc:540
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:549
-#: plugins/admin/fai/class_faiManagement.inc:550
+#: plugins/admin/fai/class_faiManagement.inc:560
+#: plugins/admin/fai/class_faiManagement.inc:561
 msgid "Profile"
 msgstr "Profil"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:79
+#: plugins/admin/fai/class_faiVariableEntry.inc:82
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Bitte geben Sie einen Wert für das Attribute 'Inhalt' an."
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:83
-#: plugins/admin/fai/class_faiScriptEntry.inc:96
-#: plugins/admin/fai/class_faiHookEntry.inc:101
-#: plugins/admin/fai/class_faiTemplateEntry.inc:161
+#: plugins/admin/fai/class_faiVariableEntry.inc:86
+#: plugins/admin/fai/class_faiScriptEntry.inc:99
+#: 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."
 
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiHook.tpl:32 plugins/admin/fai/faiTemplate.tpl:32
+#: plugins/admin/fai/faiHook.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:154
 msgid "Objects"
 msgstr "Objekte"
 
@@ -7781,20 +7957,19 @@ msgstr "Liste benutzter Variablen"
 msgid "Choose a variable to delete or edit"
 msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:48
-#: plugins/admin/fai/class_faiHookEntry.inc:51
+#: plugins/admin/fai/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiHookEntry.inc:54
 msgid "Please select a valid file."
 msgstr "Bitte wählen Sie eine gültige Datei."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
+#: plugins/admin/fai/class_faiScriptEntry.inc:54
+#: plugins/admin/fai/class_faiHookEntry.inc:57
 msgid "Selected file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:100
-#, fuzzy
+#: plugins/admin/fai/class_faiScriptEntry.inc:103
 msgid "Please enter a script."
-msgstr "Bitte geben Sie einen Benutzer ein."
+msgstr "Bitte geben Sie einen Skript an."
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/fai/faiScriptEntry.tpl:48
@@ -7810,25 +7985,28 @@ msgstr "W
 msgid "Import script"
 msgstr "Skript importieren"
 
-#: plugins/admin/fai/class_faiPackage.inc:118
+#: 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:256
+#: 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:338
+#: 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:342
+#: 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"
+msgstr "Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
+
+#: plugins/admin/fai/class_faiPackage.inc:402
+msgid "package is configured"
+msgstr "Paket ist konfiguriert"
 
-#: plugins/admin/fai/class_faiPackage.inc:373
+#: plugins/admin/fai/class_faiPackage.inc:426
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Paket '%s' existiert nicht."
@@ -7849,72 +8027,70 @@ msgstr "Mirror"
 msgid "mirror"
 msgstr "Mirror"
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:68
 msgid "Used packages"
 msgstr "Verwendete Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:69
+#: plugins/admin/fai/faiPackage.tpl:70
 msgid "Choosen packages"
 msgstr "Gewählte Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:75 include/functions.inc:587
+#: plugins/admin/fai/faiPackage.tpl:76 include/functions.inc:595
 msgid "Configure"
-msgstr "Einstellen"
+msgstr "Konfigurieren"
 
-#: plugins/admin/fai/class_faiProfile.inc:142
-#: plugins/admin/fai/class_faiProfileEntry.inc:148
+#: plugins/admin/fai/class_faiProfile.inc:145
+#: plugins/admin/fai/class_faiProfileEntry.inc:151
 msgid "This list displays all assigned class names for this profile."
 msgstr "Diese Liste zeigt alle diesem Profil zugeordneten Klassen-Namen."
 
-#: plugins/admin/fai/class_faiProfile.inc:150
+#: plugins/admin/fai/class_faiProfile.inc:153
 msgid "Append new class names"
 msgstr "Neue Klassen-Namen anfügen"
 
-#: plugins/admin/fai/class_faiProfile.inc:153
-#: plugins/admin/fai/class_faiProfileEntry.inc:115
+#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfileEntry.inc:118
 msgid "Hook bundle"
 msgstr "Hook-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:154
-#: plugins/admin/fai/class_faiProfileEntry.inc:116
+#: plugins/admin/fai/class_faiProfile.inc:157
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Template bundle"
 msgstr "Vorlagen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:155
-#: plugins/admin/fai/class_faiProfileEntry.inc:117
+#: plugins/admin/fai/class_faiProfile.inc:158
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Script bundle"
 msgstr "Skript-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:156
-#: plugins/admin/fai/class_faiProfileEntry.inc:118
+#: plugins/admin/fai/class_faiProfile.inc:159
+#: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Variable bundle"
 msgstr "Variablen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:157
+#: plugins/admin/fai/class_faiProfile.inc:160
 msgid "Packages bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:160
+#: plugins/admin/fai/class_faiProfile.inc:163
 msgid "Remove class from profile"
 msgstr "Entferne Klasse von Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:223
+#: plugins/admin/fai/class_faiProfile.inc:226
 msgid "Please assign at least one class to this  profile."
 msgstr "Bitte ordnen Sie diesem Profil mindestens eine Klasse zu."
 
-#: plugins/admin/fai/class_faiProfile.inc:227
+#: plugins/admin/fai/class_faiProfile.inc:230
 msgid "Please enter a valid name."
 msgstr "Bitte geben Sie einen gültigen Namen ein."
 
-#: plugins/admin/fai/class_faiProfile.inc:235
+#: plugins/admin/fai/class_faiProfile.inc:238
 msgid "There is already a profile with this class name defined."
-msgstr ""
-"Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
+msgstr "Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
 
 #: plugins/admin/fai/faiProfile.tpl:32
-#, fuzzy
 msgid "FAI classes"
-msgstr "Liste benutzter Klassen"
+msgstr "FAI-Klassen"
 
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
@@ -7932,41 +8108,41 @@ msgstr "Liste der Hook-Skripte"
 msgid "Choose a hook to delete or edit"
 msgstr "Wählen Sie einen Hook zum Entfernen oder Bearbeiten"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:177
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 msgid "FS type"
 msgstr "Dateisystem"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:178
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 msgid "Mount point"
 msgstr "Mount-Punkt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "Size in MB"
 msgstr "Größe in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
 msgid "Mount options"
 msgstr "Mount-Optionen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
 msgid "FS option"
 msgstr "Dateisystem-Option"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 msgid "Preserve"
 msgstr "Bewahren"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:334
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr "Bitte geben Sie einen eindeutigen Mount-Punkt für Partition %s ein."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:339
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr "Bitte geben Sie einen gültigen Mount-Punkt für Partition %s ein."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:344
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -7975,32 +8151,32 @@ msgstr ""
 "Dateisystem 'swap' wird bereits benutzt, ändern Sie bitte das Dateisystem "
 "für Partition %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:348
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 "Bitte wählen Sie 'swap' als Mount-Punkt, wenn Dateisystem 'swap' gewählt "
 "wurde."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:354
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:358
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr "Bitte geben Sie eine gültige Grösse für Partition %s ein."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:364
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr "Bitte geben Sie einen gültigen Bereich für Partition %s ein."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:371
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:374
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 "Bitte geben Sie einen Bereich für die Partitionsgröße für die Partition %s "
 "an."
 
-#: plugins/admin/fai/class_faiHookEntry.inc:97
+#: plugins/admin/fai/class_faiHookEntry.inc:108
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
 
@@ -8012,30 +8188,35 @@ msgstr "Variablen-Attribute"
 msgid "Variable content"
 msgstr "Variablen-Inhalt"
 
-#: plugins/admin/fai/faiTemplate.tpl:34
+#: plugins/admin/fai/faiTemplate.tpl:31
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
-#: plugins/admin/fai/faiTemplate.tpl:40
+#: plugins/admin/fai/faiTemplate.tpl:37
 msgid "Choose a template to delete or edit"
 msgstr "Wählen Sie eine Vorlage zum Entfernen oder Bearbeiten"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:219
-#: plugins/admin/fai/class_faiPartitionTable.inc:225
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTable.inc:226
+#: plugins/admin/fai/class_faiPartitionTable.inc:232
+#, php-format
 msgid "%s partition"
-msgstr "%s Partition(en)"
+msgstr "%s Partition"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:221
-#: plugins/admin/fai/class_faiPartitionTable.inc:227
+#: plugins/admin/fai/class_faiPartitionTable.inc:228
+#: plugins/admin/fai/class_faiPartitionTable.inc:234
 #, php-format
 msgid "%s partition(s)"
 msgstr "%s Partition(en)"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Package bundle"
 msgstr "Paket-Gruppe"
 
+#: plugins/admin/fai/class_faiProfileEntry.inc:153
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
+msgid "Class name"
+msgstr "Klassen-Name"
+
 #: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
 msgid "Hook attributes"
 msgstr "Hook-Attribute"
@@ -8046,48 +8227,47 @@ msgstr "Aufgabe"
 
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
-msgstr ""
+msgstr "Einen existierenden Task wählen"
 
-#: plugins/admin/fai/class_askClassName.inc:68
+#: plugins/admin/fai/class_askClassName.inc:71
 msgid "Create new FAI object - partition table."
 msgstr "Erstelle neues FAI-Objekt - Partitions-Tabelle"
 
-#: plugins/admin/fai/class_askClassName.inc:69
+#: plugins/admin/fai/class_askClassName.inc:72
 msgid "Create new FAI object - package bundle."
 msgstr "Erstelle neues FAI-Objekt - Paket-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:70
+#: plugins/admin/fai/class_askClassName.inc:73
 msgid "Create new FAI object - script bundle."
 msgstr "Erstelle neues FAI-Objekt - Skript-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:71
+#: plugins/admin/fai/class_askClassName.inc:74
 msgid "Create new FAI object - variable bundle."
 msgstr "Erstelle neues FAI-Objekt - Variablen-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:75
 msgid "Create new FAI object - hook bundle."
 msgstr "Erstelle neues FAI-Objekt - Hook-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:76
 msgid "Create new FAI object - profile."
 msgstr "Erstelle neues FAI-Objekt - Profil"
 
-#: plugins/admin/fai/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - template."
 msgstr "Erstelle neues FAI-Objekt - Vorlage"
 
-#: plugins/admin/fai/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object"
 msgstr "Erstelle neues FAI-Objekt"
 
-#: plugins/admin/fai/class_askClassName.inc:126
+#: plugins/admin/fai/class_askClassName.inc:131
 msgid "The given class name is empty."
 msgstr "Der angebene Klassen-Name ist leer."
 
-#: plugins/admin/fai/class_askClassName.inc:130
+#: plugins/admin/fai/class_askClassName.inc:135
 msgid "The specified class name is already in use for this object type."
-msgstr ""
-"Der angegebene Klassen-Name ist für diesen Objekt-Typ bereits in Gebrauch."
+msgstr "Der angegebene Klassen-Name ist für diesen Objekt-Typ bereits in Gebrauch."
 
 #: plugins/admin/fai/askClassName.tpl:6
 msgid ""
@@ -8116,10 +8296,6 @@ msgstr ""
 msgid "Enter FAI class name manually"
 msgstr "FAI-Klassen-Name manuell eingeben"
 
-#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
-msgid "Class name"
-msgstr "Klassen-Name"
-
 #: plugins/admin/fai/askClassName.tpl:48
 msgid "Choose FAI class name from a list of existing classes"
 msgstr "Verwenden Sie den Namen aus einer Liste bestehender Klassen."
@@ -8133,43 +8309,39 @@ msgid "Use"
 msgstr "Benutzen"
 
 #: plugins/admin/fai/askClassName.tpl:74
-#, fuzzy
 msgid "A new class name."
-msgstr "Ein neuer Klassen-Name.</b>"
+msgstr "Ein neuer Klassen-Name."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:71
+#: plugins/admin/fai/class_faiTemplateEntry.inc:74
 msgid "no file uploaded yet"
 msgstr "Es wurden noch keine Datei hochgeladen."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:73
+#: plugins/admin/fai/class_faiTemplateEntry.inc:76
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr "existiert in der Datenbank (Größe: %s Bytes)"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:153
+#: plugins/admin/fai/class_faiTemplateEntry.inc:156
 msgid "Please specify a value for attribute 'file'."
 msgstr "Bitte geben Sie einen Wert für Attribut 'Datei' an."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:157
+#: plugins/admin/fai/class_faiTemplateEntry.inc:160
 msgid "Please specify a value for attribute 'path'."
 msgstr "Bitte geben Sie einen Wert für Attribut 'Pfad' an."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:165
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
 msgid "Please enter a user."
 msgstr "Bitte geben Sie einen Benutzer ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:168
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:171
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
-msgstr ""
-"Bitte geben Sie einen gültigen Benutzer ein (0-9 und a-Z sind erlaubt)."
+msgstr "Bitte geben Sie einen gültigen Benutzer ein (0-9 und a-Z sind erlaubt)."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:172
+#: plugins/admin/fai/class_faiTemplateEntry.inc:175
 msgid "Please enter a group."
 msgstr "Bitte geben Sie eine Gruppe ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:175
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:178
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "Bitte geben Sie eine gültige Gruppe ein (0-9 und a-Z sind erlaubt)."
 
@@ -8190,7 +8362,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -8230,16 +8402,23 @@ msgstr "Andere"
 msgid "sticky"
 msgstr "sticky"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:43
-msgid ""
-"This list displays all assigned package names for this repository settings."
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr "Bitte geben Sie hier einen Such-Text ein."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid "This list displays all assigned package names for this repository settings."
 msgstr "Diese Liste zeigt alle diesem Repository zugeordneten Paket-Namen."
 
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paket"
+
 #: plugins/admin/fai/faiPackageEntry.tpl:6
 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."
@@ -8247,6 +8426,11 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Pakete auszuwählen und zur gegenwärtig "
 "bearbeiteten Paketliste hinzuzufügen."
 
+#: 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"
@@ -8279,8 +8463,7 @@ msgstr ""
 "jedoch kann der Mirror bearbeitet werden."
 
 #: plugins/admin/fai/faiPackageNew.tpl:17
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
+msgid "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 "Bitte wählen Sie zunächst das gewünschte Release, dann die Section und "
 "abschliessend den Mirror."
@@ -8297,52 +8480,73 @@ 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"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 msgid "no macro"
 msgstr "kein Makro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:547
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
+#: 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 "
+"can't be saved to asterisk database."
+msgstr ""
+"Momentan ist kein Asterisk-Server definiert. Wahrscheinlich fehlt Ihnen ein "
+"Server, der das Asterisk-Management (goFonServer) enthält. Ihre "
+"Einstellungen können daher nicht in der Asterisk-Datenbank gespeichert "
+"werden."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+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:"
 msgstr "Fehler bei der Ausführung der Anfrage:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:724
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
 msgid "This account has no phone extensions."
 msgstr "Dieses Konto besitzt keine Telefon-Erweiterungen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
-msgstr ""
-"Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
+msgstr "Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:734
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:735
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Dieses Konto besitzt aktivierte die Telefon-Erweiterungen. Sie können diese "
+"Dieses Konto besitzt aktivierte Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:738
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -8350,7 +8554,7 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "nicht aktivieren, solange keine gültige UID gesetzt ist."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:742
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -8358,19 +8562,19 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 msgid "Please enter a valid phone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:785
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:800
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:871
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Die Voicemail-PIN muss 1-4 Zeichen lang sein."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -8378,35 +8582,34 @@ msgstr ""
 "Das Feld 'Voicemail-PIN' enthält ungültige Zeichen. Nur numerische Werte "
 "sind erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:880
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
 msgid "Phone PIN must be 4 characters long."
 msgstr "Die Telefon-PIN muss 4 Zeichen lang sein."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:898
 msgid ""
 "The specified phone PIN contains invalid characters, only numeric values are "
 "allowed here."
-msgstr ""
-"Das Feld 'PIN' enthält ungültige Zeichen. Nur numerische Werte sind erlaubt."
+msgstr "Das Feld 'PIN' enthält ungültige Zeichen. Nur numerische Werte sind erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:893
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Der Parameter '%s' enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
 "verwendet"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1062
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1077
 msgid "Stop"
 msgstr "Beenden"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1097
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Benutzer '%s' von Warteschlange '%s' entfernt."
@@ -8428,46 +8631,6 @@ 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:141
-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:145
-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:154
-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/parameter.tpl:3
 msgid "Argument"
 msgstr "Argument"
@@ -8526,40 +8689,40 @@ msgstr "Regul
 msgid "Phone macro management"
 msgstr "Telefon-Makro-Verwaltung"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
-#: plugins/gofon/macro/class_gofonMacro.inc:94
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
+#: plugins/gofon/macro/class_gofonMacro.inc:103
 msgid "This 'dn' is no phone macro."
 msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
 msgstr "Zeichenkette"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Combobox"
 msgstr "Auswahl-Gruppe"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 msgid "Bool"
 msgstr "Schalter"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#: 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:334
+#: 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:363
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -8606,7 +8769,7 @@ msgstr "sichtbar"
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:150
+#: 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."
@@ -8614,55 +8777,62 @@ 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:244
+#: 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: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:262
+#: 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:271
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: 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:293
+#: 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:336
+#: 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:341
+#: 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"
+msgstr "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:345
+#: 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:350
+#: 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:356
+#: 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:361
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
@@ -8683,7 +8853,8 @@ msgstr "W
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:149
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Phone number"
 msgstr "Telefonnummer"
 
@@ -8692,7 +8863,7 @@ msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:314
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "PIN"
 msgstr "PIN"
 
@@ -8728,23 +8899,23 @@ msgstr "Telefon-Konferenzen"
 msgid "Management"
 msgstr "Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:308
+#: 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:312
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
 msgid "Name - Number"
 msgstr "Name - Nummer"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:368
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
 msgid "Conference"
 msgstr "Konferenz"
 
@@ -8766,7 +8937,7 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -8774,26 +8945,72 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:192
+#: 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:196
+#: 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:200
+#: 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:204
+#: 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: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
+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
+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"
@@ -8821,7 +9038,6 @@ msgstr ""
 "werden direkt in den LDAP-Server Ihres Unternehmens eingepflegt."
 
 #: plugins/generic/welcome/welcome.tpl:8
-#, fuzzy
 msgid ""
 "Use 'Sign out' on the upper left to close the connection and 'Main' to get "
 "back to the pictogram view."
@@ -8844,7 +9060,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:315
+#: include/php_setup.inc:71 html/main.php:316
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -8904,8 +9120,7 @@ msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
 #: include/class_mail-methods-cyrus.inc:131
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-"Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
+msgstr "Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
 
 #: include/class_mail-methods-cyrus.inc:155
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
@@ -8927,14 +9142,12 @@ msgstr "Kann das IMAP-Postfach nicht entfernen. Der Server meldete '%s'."
 #: include/class_mail-methods-cyrus.inc:223
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr ""
-"Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
+msgstr "Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
 
 #: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
-msgstr ""
-"Kann das aktive SIEVE-Skript nicht herunterladen. Die Meldung lautet '%s'."
+msgstr "Kann das aktive SIEVE-Skript nicht herunterladen. Die Meldung lautet '%s'."
 
 #: include/class_mail-methods-cyrus.inc:307
 #, php-format
@@ -8946,10 +9159,6 @@ msgstr "Kann das SIEVE-Skript nicht 
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
 
-#: include/class_pluglist.inc:91
-msgid "plHeadline"
-msgstr ""
-
 #: include/class_pluglist.inc:115
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
@@ -8968,28 +9177,27 @@ msgstr ""
 "Sie bearbeiten gerade einen Datenbankeintrag. Sollen die Daten verworfen "
 "werden?"
 
-#: 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!"
+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' "
@@ -8999,20 +9207,19 @@ 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'."
+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!"
@@ -9020,7 +9227,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!"
@@ -9028,7 +9235,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."
@@ -9036,12 +9243,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 "
@@ -9050,11 +9257,11 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:592
+#: include/functions.inc:600
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:997
+#: include/functions.inc:1005
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -9064,47 +9271,44 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1096
+#: include/functions.inc:1104
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1282
+msgid "Entries per page"
+msgstr "Einträge pro Seite"
+
+#: include/functions.inc:1310
+msgid "Apply filter"
+msgstr "Filter anwenden"
+
+#: include/functions.inc:1584
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1593
+#: include/functions.inc:1627
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
 
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Diese 'dn' hat keine Nutzerkonten Erweiterungen."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Dies ist ein leeres Modul."
-
-#: include/class_plugin.inc:398
+#: include/class_plugin.inc:391
 #, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:426 include/class_password-methods.inc:181
+#: include/class_plugin.inc:419 include/class_password-methods.inc:181
 #, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:454
+#: include/class_plugin.inc:447
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
@@ -9136,8 +9340,7 @@ msgstr ""
 "lautet '%s'."
 
 #: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgid "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 "Die Einstellung 'SMBHASH' in /etc/gosa/gosa.conf ist nicht korrekt! Das "
 "Samba-Passwort kann nicht geändert werden."
@@ -9156,8 +9359,7 @@ msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen!"
 
 #: include/class_password-methods-kerberos.inc:59
 msgid "Changing password in kerberos database failed!"
-msgstr ""
-"Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
+msgstr "Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
 
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
@@ -9223,20 +9425,36 @@ msgstr "Kann Datei nicht anlegen/
 msgid "No valid certificate loaded"
 msgstr "Kein gültiges Zertifikat geladen"
 
-#: include/functions_helpviewer.inc:292
+#: include/functions_helpviewer.inc:43
+#, php-format
+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:86
+msgid "No help available for this plugin."
+msgstr "Für dieses Modul ist keine Hilfe verfügbar."
+
+#: include/functions_helpviewer.inc:95
+msgid "previous"
+msgstr "Vorherige"
+
+#: include/functions_helpviewer.inc:99
+msgid "next"
+msgstr "Nächste"
+
+#: 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:367
+#: include/functions_helpviewer.inc:462
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
-msgstr ""
-"Kann den LDAP-Server nicht erreichen: keine Überprüfung der Schemata möglich!"
+msgstr "Kann den LDAP-Server nicht erreichen: keine Überprüfung der Schemata möglich!"
 
 #: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
@@ -9255,8 +9473,7 @@ msgstr ""
 
 #: include/functions_setup.inc:140
 #, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' does not have version %s"
+msgid "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 "Die optionale Objektklasse '%s' (benötigt vom Modul '%s') hat nicht die "
 "Versionsnummer %s"
@@ -9278,8 +9495,7 @@ msgstr "Die ben
 
 #: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
-msgstr ""
-"SAMBA 3.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
+msgstr "SAMBA 3.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
 #: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
@@ -9287,8 +9503,7 @@ msgstr "SAMBA 3 Unterst
 
 #: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
-msgstr ""
-"SAMBA 2.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
+msgstr "SAMBA 2.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
 #: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
@@ -9335,16 +9550,14 @@ msgid "Support for gofon enabled"
 msgstr "Unterstützung für GOfon aktiviert"
 
 #: include/functions_setup.inc:231
-#, fuzzy
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
-"Die Unterstützung für goFon wurde deaktiviert, das passende Schema ist nicht "
-"installiert."
+"Die Unterstützung für Nagios wurde deaktiviert, das passende Schema ist "
+"nicht installiert."
 
 #: include/functions_setup.inc:236
-#, fuzzy
 msgid "Support for nagios enabled"
-msgstr "Unterstützung für GOfon aktiviert"
+msgstr "Unterstützung für Nagios aktiviert"
 
 #: include/functions_setup.inc:246
 msgid ""
@@ -9407,8 +9620,7 @@ msgstr "Suche LDAP-Modul"
 
 #: include/functions_setup.inc:303
 msgid "This is the main module used by GOsa and therefore really required."
-msgstr ""
-"GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
+msgstr "GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
 
 #: include/functions_setup.inc:306
 msgid "Checking for XML functions"
@@ -9416,8 +9628,7 @@ msgstr "Pr
 
 #: include/functions_setup.inc:307
 msgid "XML functions are required to parse the configuration file."
-msgstr ""
-"Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
+msgstr "Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
 
 #: include/functions_setup.inc:310
 msgid "Checking for gettext support"
@@ -9487,8 +9698,7 @@ msgstr "Suche MySQL-Modul"
 
 #: include/functions_setup.inc:331
 msgid "MySQL support is needed for reading GOfax reports from databases."
-msgstr ""
-"Das MySQL-Modul wird benötigt, um FAX-Berichte anzuzeigen und auszuwerten."
+msgstr "Das MySQL-Modul wird benötigt, um Fax-Berichte anzuzeigen und auszuwerten."
 
 #: include/functions_setup.inc:334
 msgid "Checking for cups module"
@@ -9519,8 +9729,7 @@ msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
 #: include/functions_setup.inc:343
-msgid ""
-"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgid "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Simple Network Management Protocol (SNMP) wird zur Client-Überwachung "
 "benötigt."
@@ -9530,12 +9739,12 @@ msgid "PHP detailed function inspection"
 msgstr "Detaillierte Überprüfung der verwendeten PHP-Funktionen"
 
 #: include/functions_setup.inc:383
-#, fuzzy, php-format
+#, php-format
 msgid "Checking for function %s"
-msgstr "Prüfe auf XML-Funktionen"
+msgstr "Prüfe Funktion %s"
 
 #: include/functions_setup.inc:384
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
@@ -9555,8 +9764,7 @@ msgstr "Suche nach ImageMagick (>=5.4.0)"
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
-msgstr ""
-"ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
+msgstr "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
 #: include/functions_setup.inc:408
 msgid "Checking imagick module for PHP"
@@ -9566,8 +9774,7 @@ msgstr "Pr
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
-msgstr ""
-"ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
+msgstr "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
 #: include/functions_setup.inc:416
 msgid "Checking for fping utility"
@@ -9716,8 +9923,7 @@ msgstr ""
 #: include/functions_setup.inc:928
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
-msgstr ""
-"Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
+msgstr "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
 
 #: include/functions_setup.inc:1038 include/functions_setup.inc:1061
 #: include/functions_setup.inc:1070 html/index.php:172
@@ -9730,8 +9936,13 @@ msgstr ""
 "In ihrem Setup fehlt ein administratives Konto für GOsa, Sie sind deshalb "
 "nicht in der Lage, irgendetwas einzustellen!"
 
-#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
-#, fuzzy, php-format
+#: include/class_ppdManager.inc:13
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
+msgstr "PPD manager: Der angegebene Pfad '%s' existiert nicht."
+
+#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
@@ -9739,198 +9950,161 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - Zeile zu lang. "
 "Nachfolgende Zeichen wurden ausgelassen."
 
-#: include/class_ppdManager.inc:132
-#, fuzzy
+#: include/class_ppdManager.inc:137
 msgid "Nested groups are not supported!"
-msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
+msgstr "Verschachtelte Gruppen werden nicht unterstützt!"
 
-#: include/class_ppdManager.inc:136
-#, fuzzy
+#: include/class_ppdManager.inc:141
 msgid "Group name not unique!"
-msgstr "Gruppenname"
+msgstr "Der Gruppenname ist nicht eindeutig!"
 
-#: include/class_ppdManager.inc:142 include/class_ppdManager.inc:172
+#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
 msgid "Symbol values are not supported yet!"
-msgstr ""
+msgstr "Symbolische Werte werden noch nicht unterstützt!"
 
-#: include/class_ppdManager.inc:166
+#: include/class_ppdManager.inc:171
 msgid "Nested options are not supported!"
-msgstr ""
+msgstr "Verschachtelte Werte werden noch nicht unterstützt."
 
-#: include/class_ppdManager.inc:191
+#: include/class_ppdManager.inc:196
 msgid "PickMany is not supported yet!"
-msgstr ""
+msgstr "Die Option PickMany wird noch nicht unterstützt!"
 
-#: include/class_ppdManager.inc:263
+#: include/class_ppdManager.inc:268
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information "
 "gefunden."
 
-#: html/helpviewer.php:58
-msgid "Help is not available if you are not logged in."
-msgstr "Um die Hilfe zu betrachten, müssen Sie angemeldet sein."
+#: include/class_xmlParse.inc:42
+#, php-format
+msgid "Could not open XML input '%s'."
+msgstr "Kann die XML-Datei '%s' nicht öffnen."
 
-#: html/helpviewer.php:89
-msgid "previous"
-msgstr "Vorherige"
+#: 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"
 
-#: html/helpviewer.php:93
-msgid "next"
-msgstr "Nächste"
+#: include/class_debconfTemplate.inc:251
+msgid "This package has no debconf options."
+msgstr "Dieses Paket verfügt über keine debconf-Optionen."
+
+#: html/helpviewer.php:113
+msgid "There is no helpfile specified for this class."
+msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
 
-#: html/helpviewer.php:154
+#: html/helpviewer.php:223
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
+"Auf das Hilfeverzeichnis '%s' kann nicht zugegriffen werden - kann daher "
+"keine Hilfedateien lesen."
 
-#: html/helpviewer.php:162 ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr "Index"
-
-#: html/getxls.php:54
+#: html/getxls.php:65
 msgid "Birthday"
-msgstr ""
+msgstr "Geburtstag"
 
-#: html/getxls.php:54
-#, fuzzy
-msgid "Sexe"
-msgstr "Geschlecht"
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Surname"
+msgstr "Name"
 
-#: html/getxls.php:54 html/getxls.php:149 html/getxls.php:194
-#: html/getxls.php:206
-#, fuzzy
-msgid "Firstname"
-msgstr "Listenname"
+#: html/getxls.php:74
+#, php-format
+msgid "User list of %s on %s"
+msgstr "Benutzerliste von %s am %s"
 
-#: html/getxls.php:79 html/getxls.php:197
-#, fuzzy
+#: html/getxls.php:94 html/getxls.php:227
 msgid "Members"
-msgstr "Zusammengefasste Objekte"
-
-#: html/getxls.php:104 html/getxls.php:214
-#, fuzzy
-msgid "Computers"
-msgstr "Zähle Benutzer"
+msgstr "Mitglieder"
 
-#: html/getxls.php:114 html/getxls.php:161 html/getxls.php:287
-#: html/getxls.php:304
-msgid "Common Name"
-msgstr ""
+#: html/getxls.php:104 html/getxls.php:295
+#, php-format
+msgid "Groups of %s on %s"
+msgstr "Gruppen von %s vom %s"
 
-#: html/getxls.php:126
-#, fuzzy
-msgid "Server Name"
-msgstr "Server-Name"
+#: html/getxls.php:124 html/getxls.php:246
+msgid "Computers"
+msgstr "Systeme"
 
-#: html/getxls.php:149
-#, fuzzy
+#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
+#: html/getxls.php:356
 msgid "Common name"
-msgstr "Name des Standortes:"
+msgstr "Name"
 
-#: html/getxls.php:149
-#, fuzzy
-msgid "Display Name"
-msgstr "Angezeigter Name"
+#: html/getxls.php:156 html/getxls.php:314
+#, php-format
+msgid "Servers of %s on %s"
+msgstr "Server von %s vom %s"
 
-#: html/getxls.php:149
+#: html/getxls.php:174
 msgid "Home postal address"
-msgstr ""
+msgstr "Private Adresse"
 
-#: html/getxls.php:149
-#, fuzzy
+#: html/getxls.php:174
 msgid "Mobile phone"
-msgstr "Telefon (zu Hause)"
+msgstr "Mobiltelefon"
 
-#: html/getxls.php:149
-#, fuzzy
+#: html/getxls.php:174 html/getxls.php:236
 msgid "Postal address"
-msgstr "Postleitzahl"
-
-#: html/getxls.php:149
-#, fuzzy
-msgid "Adress"
 msgstr "Adresse"
 
-#: html/getxls.php:149
-#, fuzzy
-msgid "Surename"
-msgstr "Server-Name"
-
-#: html/getxls.php:149
-#, fuzzy
+#: html/getxls.php:174
 msgid "Function"
 msgstr "Funktion"
 
-#: html/getxls.php:194
-#, fuzzy
-msgid "BirthDate"
-msgstr "Datum"
-
-#: html/getxls.php:200
-msgid "Uid"
-msgstr ""
+#: html/getxls.php:177 html/getxls.php:247
+msgid "Adressbook"
+msgstr "Adressbuch"
 
-#: html/getxls.php:206
-#, fuzzy
-msgid "DisplayName"
-msgstr "Angezeigter Name"
+#: html/getxls.php:184 html/getxls.php:349
+#, php-format
+msgid "Adressbook of %s on %s"
+msgstr "Adressbuch von  %s vom %s"
 
-#: html/getxls.php:206
-#, fuzzy
-msgid "Phone Number"
-msgstr "Telefonnummer"
+#: html/getxls.php:190
+msgid "Common Name"
+msgstr "Name"
 
-#: html/getxls.php:206
-#, fuzzy
-msgid "Postal Adress"
-msgstr "Postleitzahl"
+#: html/getxls.php:224
+msgid "Day of birth"
+msgstr "Geburtsdatum"
 
-#: html/getxls.php:206
-#, fuzzy
+#: html/getxls.php:236
 msgid "Email address"
-msgstr "Primäre Adresse"
-
-#: html/getxls.php:206
-#, fuzzy
-msgid "mobile"
-msgstr "Mobiltelefon"
-
-#: html/getxls.php:206
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisationsbezogen"
+msgstr "Email-Adresse"
 
-#: html/getxls.php:206
-#, fuzzy
-msgid "Postal Address"
-msgstr "Postleitzahl"
+#: html/getxls.php:236
+msgid "Organizational unit"
+msgstr "Organisationeinheit"
 
-#: html/getxls.php:206
-#, fuzzy
+#: html/getxls.php:236
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: html/getxls.php:206
-#, fuzzy
-msgid "Sn"
-msgstr "S"
-
-#: html/getxls.php:206
-#, fuzzy
-msgid "st"
-msgstr "setzen"
+#: html/getxls.php:236
+msgid "Surename"
+msgstr "Nachname"
 
-#: html/getxls.php:206
-#, fuzzy
+#: html/getxls.php:236
 msgid "Title"
-msgstr "Datei"
+msgstr "Titel"
 
-#: html/getxls.php:215
-#, fuzzy
-msgid "Adressbook"
-msgstr "Adressbuch"
+#: html/getxls.php:239
+msgid "Full"
+msgstr "Voll"
+
+#: html/getxls.php:276
+#, php-format
+msgid "User List of %s on %s"
+msgstr "Benutzerliste von %s vom %s"
+
+#: html/getxls.php:330
+#, php-format
+msgid "Computers of %s on %s"
+msgstr "Systeme von %s vom %s"
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -9946,8 +10120,7 @@ msgstr "Die Datenbankabfrage ist fehlgeschlagen!"
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
+msgstr "Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
 
 #: html/setup.php:86
 #, php-format
@@ -9972,14 +10145,13 @@ msgstr ""
 "Achtung: die Speichernutzung ist zu hoch - bitte erhöhen Sie das "
 "memory_limit!"
 
-#: html/main.php:286
+#: html/main.php:287
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Es kann kein Plugin für die Definition '%s' gefunden werden!"
 
-#: html/main.php:315
-msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+#: html/main.php:316
+msgid "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 "Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
@@ -9996,7 +10168,7 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: 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."
@@ -10004,9 +10176,8 @@ 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
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+#: html/index.php:153
+msgid "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Ihr LDAP-Server enthält veraltete Schema-Definitionen. Bitte führen Sie "
 "erneut die Einrichtung durch."
@@ -10023,11 +10194,11 @@ 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
+#: 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"
 
@@ -10050,8 +10221,7 @@ msgstr "Bitte entscheiden Sie, wie f
 
 #: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
+msgstr "Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
 
 #: ihtml/themes/altlinux/sizelimit.tpl:10
 #: ihtml/themes/default/sizelimit.tpl:10
@@ -10430,6 +10600,10 @@ msgstr ""
 msgid "GOsa help viewer"
 msgstr "GOsa Hilfe-Browser"
 
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr "Index"
+
 #: ihtml/themes/default/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
@@ -10449,142 +10623,8 @@ msgstr "Zeige/Verstecke"
 #: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
-"GOsa kann Fehler im PHP-Interpreter erzeugen (insbesondere bei Beta-"
-"Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
+"GOsa kann Fehler im PHP-Interpreter erzeugen. In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
 "aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
 
-#~ msgid "fr_FR"
-#~ msgstr "fr_FR"
-
-#~ msgid "en_EN"
-#~ msgstr "en_EN"
-
-#~ msgid "de_DE"
-#~ msgstr "de_DE"
-
-#~ msgid "it_IT"
-#~ msgstr "it_IT"
-
-#~ msgid "nl_NL"
-#~ msgstr "nl_NL"
-
-#~ msgid "email"
-#~ msgstr "Email"
-
-#~ msgid "pager"
-#~ msgstr "Pager"
-
-#~ msgid "Nagios Auth"
-#~ msgstr "Nagios Auth"
-
-#, fuzzy
-#~ msgid "authorized_for_system_information"
-#~ msgstr "System-Information"
-
-#~ msgid "organizations user database"
-#~ msgstr "Nutzerdatenbank der Organisation"
-
-#~ msgid "Create template"
-#~ msgstr "Neue Vorlage erstellen"
-
-#~ msgid "PPD"
-#~ msgstr "PPD"
-
-#~ msgid "Following objects are assigned as user."
-#~ msgstr "Die folgenden Objekte sind als Benutzer zugeordnet"
-
-#~ msgid "Following objects are assigned as admin."
-#~ msgstr "Die folgenden Objekte sind als Administrator zugeordnet"
-
-#~ msgid "Add admin user"
-#~ msgstr "Administrator hinzufügen"
-
-#~ msgid "Add admin group"
-#~ msgstr "Administrator-Gruppe hinzufügen"
-
-#~ msgid "Undefined"
-#~ msgstr "nicht definiert"
-
-#~ msgid ""
-#~ "To change the terminal root password use the fields below. The changes "
-#~ "take effect during next reboot. Please memorize the new password, because "
-#~ "the you would't be able to log in. <b>Leave fields blank for password "
-#~ "inheritance from default entries.</b>"
-#~ msgstr ""
-#~ "Um das root-Passwort des Terminals zu ändern, benutzen Sie die unteren "
-#~ "Felder. Die Veränderungen werden während des nächsten Starts des "
-#~ "Terminals wirksam. Bitte merken Sie sich dieses Passwort, da Sie sonst "
-#~ "nicht in der Lage sein werden, sich am entsprechenden System anzumelden. "
-#~ "<b>Lassen Sie das Feld leer, um das Passwort von den Standard-"
-#~ "Einstellungen zu übernehmen.</b>"
-
-#~ msgid "Select entry"
-#~ msgstr "Auswahl des Eintrags"
-
-#~ msgid "Select user/group to add"
-#~ msgstr "Wählen Sie die hinzuzufügenden Benutzer/Gruppen"
-
-#~ msgid "Printer driver information file setup"
-#~ msgstr "Einrichtung der Informations-Datei des Drucker-Treibers"
-
-#~ msgid "Current used information setup: "
-#~ msgstr "Momentan genutzte Informationen: "
-
-#~ msgid "List of PPDs"
-#~ msgstr "Liste der PPDs"
-
-#~ msgid "Reset list"
-#~ msgstr "Liste zurücksetzen"
-
-#~ msgid "Upload PPD"
-#~ msgstr "PPD hochladen"
-
-#~ msgid "List with all available ppd files."
-#~ msgstr "Zeige verfügbare PPD-Dateien"
-
-#~ msgid "Entries"
-#~ msgstr "Einträge"
-
-#~ msgid "selected"
-#~ msgstr "ausgewählt"
-
-#~ msgid "Please select a PPD or press cancel"
-#~ msgstr "Bitte wählen Sie eine PPD oder Abbrechen"
-
-#~ msgid "Automount devices (format: complete autofs entry)"
-#~ msgstr "Automount-Geräte (Format: kompletter autofs-Eintrag)"
-
-#~ msgid "Add additional automount entries"
-#~ msgstr "Zusätzliche \"Automount-Einträge\" hinzufügen"
-
-#~ msgid "Additional fstab entries"
-#~ msgstr "Zusätzliche fstab-Einträge"
-
-#~ msgid "Add additional filesystems to be mounted during startup"
-#~ msgstr ""
-#~ "Zusätzliche Dateisysteme hinzufügen, die während des Starts gemountet "
-#~ "werden"
-
-#~ msgid "Service"
-#~ msgstr "Dienst"
-
-#~ msgid "Object groups need at least one member!"
-#~ msgstr "Objektgruppen sollten mindestens ein Mitglied haben!"
-
-#~ msgid "Uruguai"
-#~ msgstr "Uruguay"
-
-#~ msgid "List of used class names"
-#~ msgstr "Liste benutzter FAI-Klassen"
-
-#~ msgid "Checking for function <b>%s</b>"
-#~ msgstr "Prüfe auf Verfügbarkeit der Funktion <b>%s</b>"
-
-#~ msgid ""
-#~ "Can't read any helpfiles from ' %s ', possibly there is no help available."
-#~ msgstr ""
-#~ "Kann keine Hilfe-Dateien unter '%s' finden, wahrscheinlich ist keine "
-#~ "Hilfe verfügbar."