Fixed Translation String.

[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 e0402e75d6983ee3fdfc91029e3fe6abd478414f..aa819f0efbb53ad2d292d2a0f471c1424cd82729 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@
 # This file is distributed under the same license as the GOsa2 package.
 # 
 # 
-#: plugins/personal/generic/class_user.inc:1305
+#: plugins/personal/generic/class_user.inc:1287
 #: plugins/admin/systems/class_terminalService.inc:452
 #: plugins/admin/systems/class_terminalService.inc:453
 #: include/class_plugin.inc:115 include/class_plugin.inc:116
@@ -16,15 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-05 11:00+0200\n"
-"PO-Revision-Date: 2006-10-05 12:13+0200\n"
+"POT-Creation-Date: 2006-11-09 12:07+0100\n"
+"PO-Revision-Date: 2006-11-09 12:05+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1317
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1299
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -32,25 +32,25 @@ msgstr "Mein Konto"
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:61
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
 msgid "Addons"
 msgstr "Zusätzliches"
 
 #: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
-#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
-#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
-#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
+#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:113
+#: contrib/gosa.conf:118 contrib/gosa.conf:126 contrib/gosa.conf:134
+#: contrib/gosa.conf:143 contrib/gosa.conf:147 contrib/gosa.conf:169
+#: contrib/gosa.conf:173 contrib/gosa.conf:177 contrib/gosa.conf:181
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1294
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
 #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:880
+#: plugins/admin/groups/class_groupGeneric.inc:882
 #: plugins/admin/applications/class_applicationGeneric.inc:514
 #: plugins/admin/departments/class_departmentGeneric.inc:531
 #: plugins/admin/systems/glpiPrinter.tpl:6
@@ -66,11 +66,11 @@ msgstr "Zusätzliches"
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:690
+#: plugins/admin/ogroups/class_ogroup.inc:705
 #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiProfile.tpl:36
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
@@ -79,7 +79,7 @@ msgstr "Zusätzliches"
 #: plugins/admin/mimetypes/generic.tpl:4
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:465
+#: plugins/gofon/macro/class_gofonMacro.inc:474
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
@@ -90,18 +90,18 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/personal/environment/class_environment.inc:1240
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:189
 msgid "Environment"
 msgstr "Umgebung"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/personal/mail/class_mailAccount.inc:998
-#: plugins/admin/groups/class_groupMail.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/admin/groups/class_groupMail.inc:1054
 #: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:191
 #: plugins/admin/ogroups/tabs_ogroups.inc:76
 #: plugins/admin/ogroups/tabs_ogroups.inc:184
 #: plugins/admin/ogroups/class_mailogroup.inc:163
@@ -113,7 +113,7 @@ msgstr "Mail"
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/personal/samba/class_sambaAccount.inc:1033
 #: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:197
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -121,7 +121,7 @@ msgstr "Samba"
 
 #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
 #: plugins/personal/netatalk/class_netatalk.inc:342
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:199
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -132,31 +132,31 @@ msgstr "Konnektivität"
 
 #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
 #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
 #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:805
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:811
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:191
+#: plugins/admin/users/class_divListUsers.inc:195
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:550
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
-#: 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/addons/addressbook/address_edit.tpl:94
+#: plugins/addons/addressbook/address_edit.tpl:221
+#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:163
 #: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:193
 #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:804
+#: plugins/admin/systems/class_systemManagement.inc:818
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/ogroups/class_phonequeue.inc:718
@@ -171,54 +171,50 @@ msgstr "Telefon"
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1102
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1163
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:112
 #: plugins/admin/mimetypes/generic.tpl:165
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:307
-msgid "ACL"
-msgstr "Zugriffsregeln"
-
-#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:240
 #: plugins/admin/ogroups/phonequeue.tpl:43
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/gofon/conference/generic.tpl:121
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:115
+#: contrib/gosa.conf:114
 #: plugins/admin/applications/class_applicationParameters.inc:230
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:664
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
 #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1100
+#: plugins/admin/systems/class_workstationStartup.inc:1109
 #: plugins/admin/ogroups/tabs_ogroups.inc:99
 msgid "Startup"
 msgstr "Start"
 
-#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: contrib/gosa.conf:120 contrib/gosa.conf:136
 #: plugins/admin/ogroups/tabs_ogroups.inc:103
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:228
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/personal/environment/environment.tpl:235
+#: plugins/admin/systems/class_systemManagement.inc:827
 #: plugins/admin/systems/class_printGeneric.inc:860
 #: plugins/admin/ogroups/class_ogroupManagement.inc:386
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
-#: plugins/gofax/blocklists/generic.tpl:75
+#: contrib/gosa.conf:122 contrib/gosa.conf:130 contrib/gosa.conf:138
+#: plugins/gofax/blocklists/generic.tpl:90
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:127
@@ -236,7 +232,7 @@ msgstr "Drucker"
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:39
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
 #: plugins/admin/systems/class_servDNS.inc:383
 #: plugins/admin/systems/class_goFaxServer.inc:85
 #: plugins/admin/systems/class_servKolab.inc:375
@@ -252,22 +248,22 @@ msgstr "Information"
 #: plugins/admin/systems/class_goKrbServer.inc:88
 #: plugins/admin/systems/class_goMailServer.inc:686
 #: plugins/admin/systems/class_goImapServer.inc:155
+#: plugins/admin/systems/class_goShareServer.inc:344
 #: plugins/admin/systems/class_goVirusServer.inc:212
 #: plugins/admin/systems/class_goSpamServer.inc:320
-#: plugins/admin/systems/class_goShareServer.inc:344
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:140
+#: contrib/gosa.conf:129 contrib/gosa.conf:139
 #: plugins/admin/fai/class_faiSummaryTab.inc:546
 msgid "FAI summary"
 msgstr "FAI Übersicht"
 
-#: contrib/gosa.conf:193
+#: contrib/gosa.conf:192
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:203 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -276,11 +272,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:205
+#: contrib/gosa.conf:204
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
+#: contrib/gosa.conf:205 plugins/personal/mail/generic.tpl:141
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -290,50 +286,50 @@ msgstr "Excel-Export"
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:206
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:211
+#: contrib/gosa.conf:210
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:507
+#: plugins/admin/fai/class_faiScript.inc:518
 #: plugins/admin/fai/faiScriptEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
+#: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
 #: plugins/admin/fai/class_faiSummaryTab.inc:47
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
 #: plugins/admin/acl/class_divListACL.inc:49
 #: plugins/admin/fai/class_faiSummaryTab.inc:545
 msgid "Summary"
 msgstr "Übersicht"
 
-#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:557
+#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:538
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:258
+#: contrib/gosa.conf:257
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
@@ -380,7 +376,7 @@ msgstr "Wählen Sie die hinzuzufügenden Adressen"
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/addressbook/contents.tpl:62
 #: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
@@ -407,11 +403,11 @@ msgstr "Filter"
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/addons/addressbook/contents.tpl:84
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Choose the department the search will be based on"
 msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
@@ -433,7 +429,7 @@ msgid "User name of which addresses are shown"
 msgstr "Benutzername, dessen Adressen angezeigt werden"
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:160
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:88
@@ -445,20 +441,20 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:53
 #: plugins/personal/connectivity/class_kolabAccount.inc:255
-#: plugins/personal/environment/environment.tpl:150
-#: plugins/personal/environment/environment.tpl:174
-#: plugins/personal/environment/environment.tpl:241
+#: plugins/personal/environment/environment.tpl:157
+#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:248
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:68
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/generic.tpl:105
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:71
 #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/generic.tpl:137
 #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:573
+#: plugins/admin/groups/class_groupMail.inc:588
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
@@ -481,8 +477,8 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:473
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/class_termDNS.inc:472
+#: plugins/admin/systems/class_termDNS.inc:492
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
@@ -496,14 +492,16 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/systems/goSpamServer.tpl:45
 #: plugins/admin/systems/goSpamServer.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:28 plugins/admin/ogroups/generic.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:33
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/fai/faiHook.tpl:50
-#: plugins/admin/mimetypes/generic.tpl:108
+#: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
+#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPartitionTable.tpl:48
+#: plugins/admin/fai/faiPartitionTable.tpl:50
+#: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
+#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:40
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:48
+#: plugins/admin/fai/faiHook.tpl:50 plugins/admin/mimetypes/generic.tpl:108
 #: plugins/admin/mimetypes/generic.tpl:120
 #: plugins/admin/mimetypes/generic.tpl:174
 #: plugins/gofon/phoneaccount/generic.tpl:19
@@ -511,43 +509,43 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:97
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:97
+#: plugins/personal/posix/main.inc:107 plugins/personal/samba/main.inc:105
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:151
+#: plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:103
-#: plugins/personal/environment/main.inc:97
+#: plugins/personal/environment/main.inc:103
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:54
-#: plugins/personal/nagios/main.inc:97 plugins/personal/netatalk/main.inc:97
-#: plugins/gofax/blocklists/generic.tpl:91
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:97
+#: plugins/gofax/blocklists/generic.tpl:106
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:83
+#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:95
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/addressbook/address_edit.tpl:265
 #: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:332
+#: plugins/admin/groups/class_groupManagement.inc:335
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:352
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:492
+#: plugins/admin/systems/class_systemManagement.inc:506
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30
@@ -589,18 +587,18 @@ msgstr "Hinzufügen"
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/goVirusServer.tpl:171
 #: plugins/admin/systems/class_goService.inc:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:334
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:617
-#: plugins/admin/fai/class_faiManagement.inc:622
-#: plugins/admin/fai/class_faiManagement.inc:628
+#: plugins/admin/fai/class_faiManagement.inc:619
+#: plugins/admin/fai/class_faiManagement.inc:624
+#: plugins/admin/fai/class_faiManagement.inc:630
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:83
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:40
+#: plugins/admin/fai/faiVariableEntry.tpl:55
 #: plugins/admin/fai/faiHookEntry.tpl:85
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiTemplateEntry.tpl:171
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:51
@@ -608,15 +606,15 @@ msgstr "Hinzufügen"
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
 #: plugins/admin/mimetypes/remove.tpl:15
-#: plugins/gofon/phoneaccount/main.inc:98
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
+#: plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
 #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
-#: ihtml/themes/default/snapshotdialog.tpl:39
-#: ihtml/themes/default/snapshotdialog.tpl:82
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:38
+#: ihtml/themes/default/snapshotdialog.tpl:80
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -629,7 +627,7 @@ msgstr "Primäre Adresse"
 #: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
 #: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:805
+#: plugins/admin/systems/class_systemManagement.inc:819
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
@@ -652,9 +650,9 @@ msgid "not defined"
 msgstr "nicht definiert"
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1010
+#: plugins/personal/mail/class_mailAccount.inc:1009
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1039
+#: plugins/admin/groups/class_groupMail.inc:1065
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
@@ -670,7 +668,7 @@ msgstr "Alternative Adressen"
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:166
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:91
@@ -678,11 +676,11 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:410
 #: plugins/personal/connectivity/kolab.tpl:56
-#: plugins/personal/environment/environment.tpl:180
-#: plugins/personal/environment/environment.tpl:218
-#: plugins/personal/environment/environment.tpl:244
-#: plugins/personal/environment/class_environment.inc:658
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/personal/environment/environment.tpl:187
+#: plugins/personal/environment/environment.tpl:225
+#: plugins/personal/environment/environment.tpl:251
+#: plugins/personal/environment/class_environment.inc:685
+#: plugins/gofax/blocklists/generic.tpl:83
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:111
 #: plugins/gofax/faxaccount/lists.tpl:14
@@ -708,15 +706,16 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:487
+#: plugins/admin/systems/class_termDNS.inc:486
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
 #: plugins/admin/systems/goShareServer.tpl:20
 #: plugins/admin/ogroups/termgroup.tpl:33 plugins/admin/ogroups/generic.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:36 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:55
+#: plugins/admin/fai/faiVariable.tpl:57 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:54
 #: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/mimetypes/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:22
@@ -730,139 +729,139 @@ msgstr "Entfernen"
 msgid "Mail options"
 msgstr "Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 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, ohne eine lokale Kopie zu speichern."
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Wählen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen "
 "Text zu versenden."
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: plugins/personal/mail/generic.tpl:99
+#: plugins/personal/mail/generic.tpl:97
 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:101
+#: plugins/personal/mail/generic.tpl:99
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verschiebe Mails mit einem SPAM-Level größer als"
 
-#: plugins/personal/mail/generic.tpl:104
+#: plugins/personal/mail/generic.tpl:102
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
-#: plugins/personal/mail/generic.tpl:108
+#: plugins/personal/mail/generic.tpl:106
 msgid "to folder"
 msgstr "in den Ordner"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:117
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen, die größer sind als"
 
-#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/mail/generic.tpl:119
 #: plugins/personal/connectivity/pureftpd.tpl:60
 #: plugins/personal/connectivity/class_proxyAccount.inc:91
-#: plugins/personal/environment/environment.tpl:55
+#: plugins/personal/environment/environment.tpl:62
 #: plugins/admin/groups/mail.tpl:48
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:129
-#: plugins/personal/mail/class_mailAccount.inc:1013
+#: plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/class_mailAccount.inc:1012
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:147
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:163
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:108 plugins/admin/groups/mail.tpl:138
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
-#: plugins/personal/mail/generic.tpl:178
+#: plugins/personal/mail/generic.tpl:174
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:184
+#: plugins/personal/mail/generic.tpl:180
 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:186
+#: plugins/personal/mail/generic.tpl:182
 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:195
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/generic.tpl:190
+#: plugins/personal/mail/class_mailAccount.inc:1027
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
-#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/generic.tpl:190
 msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
-#: plugins/personal/mail/main.inc:95 plugins/personal/posix/main.inc:100
-#: plugins/personal/samba/main.inc:95 plugins/personal/generic/main.inc:149
+#: plugins/personal/mail/main.inc:103 plugins/personal/posix/main.inc:105
+#: plugins/personal/samba/main.inc:103 plugins/personal/generic/main.inc:156
 #: plugins/personal/connectivity/main.inc:101
-#: plugins/personal/environment/main.inc:95
-#: plugins/personal/nagios/main.inc:95 plugins/personal/netatalk/main.inc:95
-#: plugins/gofax/blocklists/generic.tpl:85
-#: plugins/gofax/faxaccount/main.inc:81
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/personal/environment/main.inc:101
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:95
+#: plugins/gofax/blocklists/generic.tpl:100
+#: plugins/gofax/faxaccount/main.inc:93
+#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/users/class_userManagement.inc:646
 #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:500
 #: plugins/admin/ogroups/class_ogroupManagement.inc:328
-#: plugins/admin/fai/class_faiManagement.inc:611
+#: plugins/admin/fai/class_faiManagement.inc:613
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
-#: plugins/gofon/phoneaccount/main.inc:96
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
 msgid "Ok"
 msgstr "Ok"
 
-#: plugins/personal/mail/main.inc:105 plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/main.inc:107 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:113 plugins/personal/posix/main.inc:117
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:111
-#: plugins/personal/environment/main.inc:105
-#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:102
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/personal/environment/main.inc:111
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:102
+#: plugins/gofax/faxaccount/main.inc:101
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
 "Dialog zu ändern"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/posix/main.inc:114
-#: plugins/personal/samba/main.inc:108 plugins/personal/generic/main.inc:162
+#: plugins/personal/mail/main.inc:116 plugins/personal/posix/main.inc:119
+#: plugins/personal/samba/main.inc:116 plugins/personal/generic/main.inc:169
 #: plugins/personal/connectivity/main.inc:112
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/main.inc:106
-#: plugins/personal/nagios/main.inc:107 plugins/personal/netatalk/main.inc:103
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/main.inc:112
+#: plugins/personal/nagios/main.inc:116 plugins/personal/netatalk/main.inc:103
 #: plugins/gofax/faxaccount/generic.tpl:121
 #: plugins/gofax/faxaccount/generic.tpl:129
-#: plugins/gofax/faxaccount/main.inc:90 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/printer.tpl:68
+#: plugins/gofax/faxaccount/main.inc:102
+#: plugins/addons/logview/contents.tpl:62 plugins/admin/systems/printer.tpl:68
 #: plugins/admin/systems/glpiPrinter.tpl:88
 #: plugins/admin/systems/glpiPrinter.tpl:99
 #: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/glpi.tpl:61
@@ -872,18 +871,18 @@ msgstr ""
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/goShareServer.tpl:17
-#: plugins/admin/fai/faiVariable.tpl:45
-#: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/admin/fai/faiVariable.tpl:53
+#: plugins/admin/fai/faiPartitionTable.tpl:53
+#: plugins/gofon/phoneaccount/main.inc:114
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: plugins/personal/mail/main.inc:114
+#: plugins/personal/mail/main.inc:125
 msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:998
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
@@ -933,7 +932,7 @@ msgid "This does something"
 msgstr "Dies tut etwas"
 
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:75
+#: plugins/admin/groups/class_groupMail.inc:76
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
@@ -950,7 +949,7 @@ msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
 #: plugins/personal/mail/class_mailAccount.inc:262
 #: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:332
+#: plugins/admin/groups/class_groupMail.inc:335
 #: plugins/admin/ogroups/class_mailogroup.inc:44
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
@@ -964,7 +963,7 @@ msgstr ""
 "Entfernen Sie diese zunächst und wiederholen Sie den Vorgang."
 
 #: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:336
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -973,13 +972,13 @@ msgstr ""
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:335
+#: plugins/admin/groups/class_groupMail.inc:338
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:339
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -995,7 +994,7 @@ msgstr ""
 "aufzunehmen."
 
 #: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:400
+#: plugins/admin/groups/class_groupMail.inc:415
 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 "
@@ -1003,94 +1002,94 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:357
 #: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/admin/groups/class_groupMail.inc:426
+#: plugins/admin/groups/class_groupMail.inc:441
 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:372
-#: plugins/admin/groups/class_groupMail.inc:431
+#: plugins/admin/groups/class_groupMail.inc:446
 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:597
+#: plugins/personal/mail/class_mailAccount.inc:596
 #, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Entfernen des Benutzer/Mail-Kontos mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/personal/mail/class_mailAccount.inc:724
 #, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Mail-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/mail/class_mailAccount.inc:777
+#: plugins/personal/mail/class_mailAccount.inc:776
 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:782
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:781
+#: plugins/admin/groups/class_groupMail.inc:877
 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:786
-#: plugins/personal/mail/class_mailAccount.inc:790
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/addons/addressbook/class_addressbook.inc:694
 #: plugins/admin/ogroups/class_mailogroup.inc:79
 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:796
-#: plugins/admin/groups/class_groupMail.inc:860
+#: plugins/personal/mail/class_mailAccount.inc:795
+#: plugins/admin/groups/class_groupMail.inc:886
 #: plugins/admin/ogroups/class_mailogroup.inc:86
 msgid "The primary address you've entered is already in use."
 msgstr ""
 "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:802
-#: plugins/admin/groups/class_groupMail.inc:866
+#: plugins/personal/mail/class_mailAccount.inc:801
+#: plugins/admin/groups/class_groupMail.inc:892
 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:811
-#: plugins/admin/groups/class_groupMail.inc:875
+#: plugins/personal/mail/class_mailAccount.inc:810
+#: plugins/admin/groups/class_groupMail.inc:901
 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:821
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/personal/mail/class_mailAccount.inc:820
+#: plugins/admin/groups/class_groupMail.inc:909
 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:825
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
-#: plugins/personal/mail/class_mailAccount.inc:865
-#: plugins/personal/mail/class_mailAccount.inc:877
+#: plugins/personal/mail/class_mailAccount.inc:864
+#: plugins/personal/mail/class_mailAccount.inc:876
 msgid "You are not allowed to write mail forwarding."
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
 
-#: plugins/personal/mail/class_mailAccount.inc:909
-#: plugins/personal/mail/class_mailAccount.inc:920
+#: plugins/personal/mail/class_mailAccount.inc:908
+#: plugins/personal/mail/class_mailAccount.inc:919
 #, fuzzy
 msgid "You are not allowed to write mail alternate address."
 msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:984
 msgid "Waiting for kolab to remove mail properties."
 msgstr "Warte auf Entfernung der Mail-Einstellungen durch Kolab."
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:986
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1098,69 +1097,64 @@ msgstr ""
 "Bitte entfernen Sie zunächst das Mail-Konto, damit Kolab Gelegenheit hat "
 "seine Einstellungen zu entfernen."
 
-#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/personal/mail/class_mailAccount.inc:1007
 #: plugins/personal/nagios/nagios.tpl:17
 #: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/admin/groups/class_groupMail.inc:1036
+#: plugins/addons/addressbook/class_addressbook.inc:797
+#: plugins/admin/groups/class_groupMail.inc:1062
 #: plugins/admin/systems/class_servDNS.inc:394
 #: plugins/admin/systems/servdnseditzone.tpl:51
-#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:174
+#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:225
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:1009
-#: plugins/admin/groups/class_groupMail.inc:1040
+#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/admin/groups/class_groupMail.inc:1066
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: plugins/personal/mail/class_mailAccount.inc:1012
+#: plugins/personal/mail/class_mailAccount.inc:1011
 msgid "Add vacation information"
 msgstr "Urlaubsinformationen hinzufügen"
 
-#: plugins/personal/mail/class_mailAccount.inc:1015
+#: plugins/personal/mail/class_mailAccount.inc:1014
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1015
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/personal/mail/class_mailAccount.inc:1016
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/mail/class_mailAccount.inc:1018
 msgid "Reject due to mailsize"
 msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1019
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
-#: plugins/personal/mail/class_mailAccount.inc:1022
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1026
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1022
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1023
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1024
 msgid "Mail alternative addresses"
 msgstr "Weitere Adressen"
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:255
-msgid "Change password"
-msgstr "Passwort ändern"
-
-#: plugins/personal/password/password.tpl:6
+#: plugins/personal/password/password.tpl:3
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
@@ -1170,12 +1164,12 @@ msgstr ""
 "sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne "
 "dieses nicht mehr anmelden können."
 
-#: plugins/personal/password/password.tpl:11
-#: plugins/personal/password/main.inc:73
+#: plugins/personal/password/password.tpl:8
+#: plugins/personal/password/main.inc:74
 msgid "You have no permissions to change your password."
 msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern."
 
-#: plugins/personal/password/password.tpl:13
+#: plugins/personal/password/password.tpl:10
 #: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
@@ -1184,33 +1178,33 @@ msgstr ""
 "Das Ändern des Passwortes wirkt sich auf ihre Authentifizierung bei Mail-, "
 "Proxy-, Samba- und Unix-Diensten aus."
 
-#: plugins/personal/password/password.tpl:19
+#: plugins/personal/password/password.tpl:16
 msgid "Current password"
 msgstr "Momentanes Passwort"
 
-#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:24
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: plugins/personal/password/password.tpl:35
+#: plugins/personal/password/password.tpl:32
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Neues Passwort (Wiederholung)"
 
-#: plugins/personal/password/password.tpl:48
+#: plugins/personal/password/password.tpl:45
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: plugins/personal/password/password.tpl:52
+#: plugins/personal/password/password.tpl:49
 msgid "Clear fields"
 msgstr "Felder löschen"
 
-#: plugins/personal/password/changed.tpl:6
+#: plugins/personal/password/changed.tpl:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
@@ -1218,8 +1212,8 @@ msgstr ""
 "Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle "
 "Programme anzupassen, die dieses Passwort auch benutzen."
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:159
+#: plugins/personal/password/changed.tpl:8
+#: plugins/personal/generic/main.inc:166
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
@@ -1227,7 +1221,7 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/mailqueue/header.tpl:5
 #: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1531
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1445
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1237,13 +1231,13 @@ msgid "Back"
 msgstr "Zurück"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:32
+#: plugins/personal/generic/paste_generic.tpl:20
 #: plugins/admin/systems/class_goFaxServer.inc:94
 #: plugins/admin/systems/goKrbServer.tpl:20
 #: plugins/admin/systems/goFonServer.tpl:12
 #: plugins/admin/systems/class_goGlpiServer.inc:98
 #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 #: plugins/admin/systems/goImapServer.tpl:34
 #: plugins/admin/systems/class_goFonServer.inc:107
 #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1256,7 +1250,7 @@ msgid "Password"
 msgstr "Passwort"
 
 #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1305
 msgid "User password"
 msgstr "Benutzerpasswort"
 
@@ -1268,7 +1262,7 @@ msgstr "Passwort-Änderung ist nicht erlaubt"
 msgid "You are not allowed to change your password at this time"
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern"
 
-#: plugins/personal/password/main.inc:44
+#: plugins/personal/password/main.inc:45
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -1276,12 +1270,12 @@ msgstr ""
 "Das Passwort, welches Sie als aktuelles Passwort eingegeben haben, ist nicht "
 "korrekt."
 
-#: plugins/personal/password/main.inc:47
+#: plugins/personal/password/main.inc:48
 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:52 plugins/personal/generic/main.inc:76
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/personal/password/main.inc:53 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:218
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1289,27 +1283,32 @@ msgstr ""
 "Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort "
 "(Wiederholung)' eingegeben haben sind nicht identisch."
 
-#: plugins/personal/password/main.inc:55 plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:224
+#: plugins/personal/password/main.inc:56 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:223
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
-#: plugins/personal/password/main.inc:63
+#: plugins/personal/password/main.inc:64
 msgid "The password used as new and current are too similar."
 msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
-#: plugins/personal/password/main.inc:68
+#: plugins/personal/password/main.inc:69
 msgid "The password used as new is to short."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
-#: plugins/personal/password/main.inc:91
+#: plugins/personal/password/main.inc:94
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
+#: plugins/personal/password/main.inc:123
+#: plugins/admin/users/class_divListUsers.inc:261
+msgid "Change password"
+msgstr "Passwort ändern"
+
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1281
+#: plugins/personal/posix/class_posixAccount.inc:1289
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
 #: plugins/personal/samba/class_sambaAccount.inc:637
@@ -1317,7 +1316,7 @@ msgid "Home directory"
 msgstr "Basisverzeichnis"
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1282
+#: plugins/personal/posix/class_posixAccount.inc:1290
 msgid "Shell"
 msgstr "Shell"
 
@@ -1329,6 +1328,7 @@ msgstr "Primäre Gruppe"
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:234
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/class_faxreport.inc:482
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
 #: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
@@ -1340,13 +1340,13 @@ msgid "Force UID/GID"
 msgstr "Erzwinge UID/GID"
 
 #: plugins/personal/posix/generic.tpl:51
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:287
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:896
+#: plugins/admin/groups/class_groupGeneric.inc:898
 msgid "GID"
 msgstr "GID"
 
@@ -1387,6 +1387,7 @@ msgstr "Zeige Gruppen der Abteilung"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
 #: plugins/admin/acl/class_divListACL.inc:57
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
@@ -1436,7 +1437,7 @@ msgstr "Zeige die Systeme der Abteilung"
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
-#: plugins/personal/posix/main.inc:123
+#: plugins/personal/posix/main.inc:128
 msgid "Unix settings"
 msgstr "UNIX-Einstellungen"
 
@@ -1466,32 +1467,32 @@ msgid "active"
 msgstr "aktiv"
 
 #: plugins/personal/posix/class_posixAccount.inc:155
-#: plugins/personal/posix/class_posixAccount.inc:1009
+#: plugins/personal/posix/class_posixAccount.inc:1002
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
+#: plugins/personal/posix/class_posixAccount.inc:190
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:212
+#: plugins/personal/posix/class_posixAccount.inc:207
 #: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:784
+#: plugins/admin/systems/class_workstationStartup.inc:791
 #: plugins/admin/systems/class_workstationService.inc:182
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:220
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:258
+#: plugins/personal/posix/class_posixAccount.inc:253
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto besitzt keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:278
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:273
+#: plugins/personal/posix/class_posixAccount.inc:276
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:279
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1499,7 +1500,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:282
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1507,11 +1508,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:285
+#: plugins/personal/posix/class_posixAccount.inc:280
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:286
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1519,28 +1520,28 @@ 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:446
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:445
 #, 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:454
+#: plugins/personal/posix/class_posixAccount.inc:449
 #, 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:458
+#: plugins/personal/posix/class_posixAccount.inc:453
 #, 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:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1549,7 +1550,7 @@ msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 msgid "January"
 msgstr "Januar"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1558,7 +1559,7 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1567,7 +1568,7 @@ msgstr "Februar"
 msgid "March"
 msgstr "März"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1576,7 +1577,7 @@ msgstr "März"
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1585,7 +1586,7 @@ msgstr "April"
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1594,7 +1595,7 @@ msgstr "Mai"
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1603,7 +1604,7 @@ msgstr "Juni"
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1612,7 +1613,7 @@ msgstr "Juli"
 msgid "August"
 msgstr "August"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1621,7 +1622,7 @@ msgstr "August"
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1630,7 +1631,7 @@ msgstr "September"
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1639,7 +1640,7 @@ msgstr "Oktober"
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1648,151 +1649,151 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 #: plugins/personal/samba/class_sambaAccount.inc:468
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:568
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/personal/posix/class_posixAccount.inc:621
+#: plugins/personal/posix/class_posixAccount.inc:614
 #, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
 msgstr "Entfernen von Benutzer/POSIX-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/posix/class_posixAccount.inc:769
+#: plugins/personal/posix/class_posixAccount.inc:762
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:851
 #, php-format
 msgid "Saving of user/posix account with dn '%s' failed."
 msgstr "Speichern von Benutzer/POSIX-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "The required field 'Home directory' is not set."
 msgstr "Das benötigte Feld 'Basisverzeichnis' ist nicht gesetzt."
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
-#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'UID' is not valid."
 msgstr "Die von ihnen angebene 'UID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:941
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:795
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:944
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:798
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:945
 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:957
+#: plugins/personal/posix/class_posixAccount.inc:950
 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:962
+#: plugins/personal/posix/class_posixAccount.inc:955
 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:965
+#: plugins/personal/posix/class_posixAccount.inc:958
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:971
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:976
+#: plugins/personal/posix/class_posixAccount.inc:969
 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:979
+#: plugins/personal/posix/class_posixAccount.inc:972
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:984
+#: plugins/personal/posix/class_posixAccount.inc:977
 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:1132
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:834
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
 "reserviert werden!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1271
+#: plugins/personal/posix/class_posixAccount.inc:1279
 msgid "POSIX account"
 msgstr "POSIX-Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:1283
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
+#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
+#: html/getxls.php:364
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1284
+#: plugins/personal/posix/class_posixAccount.inc:1292
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1286
+#: plugins/personal/posix/class_posixAccount.inc:1294
 msgid "Force password change on login"
 msgstr "Erzwinge Änderung des Passwort bei Anmeldung"
 
-#: plugins/personal/posix/class_posixAccount.inc:1287
+#: plugins/personal/posix/class_posixAccount.inc:1295
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1288
+#: plugins/personal/posix/class_posixAccount.inc:1296
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1289
+#: plugins/personal/posix/class_posixAccount.inc:1297
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1290
+#: plugins/personal/posix/class_posixAccount.inc:1298
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/personal/posix/class_posixAccount.inc:1299
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Zeige Personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1292
+#: plugins/personal/posix/class_posixAccount.inc:1300
 msgid "System trust model"
 msgstr "Modell des System-Vertrauens"
 
@@ -1933,7 +1934,7 @@ msgstr "Konto läuft ab am"
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
-#: plugins/personal/samba/main.inc:116
+#: plugins/personal/samba/main.inc:124
 #: plugins/personal/samba/class_sambaAccount.inc:1034
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
@@ -2134,69 +2135,70 @@ msgstr "ungültig"
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:560
 #, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Entfernen von Benutzer/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/generic/class_user.inc:630
+#: plugins/personal/generic/class_user.inc:628
 #: plugins/admin/systems/class_printGeneric.inc:625
 #, php-format
 msgid "You are not allowed to move this object to '%s'."
 msgstr "Es ist Ihnen nicht erlaubt, dieses Objekt nach '%s' zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:877
+#: plugins/personal/generic/class_user.inc:876
 #, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/generic/class_user.inc:924
+#: plugins/personal/generic/class_user.inc:923
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:941
+#: plugins/personal/generic/class_user.inc:940
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:952
+#: plugins/personal/generic/class_user.inc:951
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:993
+#: plugins/personal/generic/class_user.inc:992
 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:996
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/generic/class_user.inc:995
+#, fuzzy
+msgid "You have no permissions to move this user to the spicified 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:1002
-#: plugins/addons/addressbook/class_addressbook.inc:553
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/personal/generic/class_user.inc:1001
+#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/admin/users/class_userManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:544
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 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:1017
-#: plugins/addons/addressbook/class_addressbook.inc:557
-#: plugins/admin/users/class_userManagement.inc:473
-#: plugins/admin/users/class_userManagement.inc:551
+#: plugins/personal/generic/class_user.inc:1016
+#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/admin/users/class_userManagement.inc:469
+#: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1027
+#: plugins/personal/generic/class_user.inc:1026
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2204,7 +2206,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:1034
+#: plugins/personal/generic/class_user.inc:1033
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2212,148 +2214,148 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1036
 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:1040
-#: plugins/personal/generic/class_user.inc:1065
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:591
+#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1064
+#: plugins/addons/addressbook/class_addressbook.inc:661
+#: plugins/addons/addressbook/class_addressbook.inc:689
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1043
-#: plugins/personal/generic/class_user.inc:1062
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/personal/generic/class_user.inc:1042
+#: plugins/personal/generic/class_user.inc:1061
+#: plugins/addons/addressbook/class_addressbook.inc:664
+#: plugins/addons/addressbook/class_addressbook.inc:686
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1048
-#: plugins/addons/addressbook/class_addressbook.inc:571
-#: plugins/addons/addressbook/class_addressbook.inc:574
+#: plugins/personal/generic/class_user.inc:1047
+#: plugins/addons/addressbook/class_addressbook.inc:669
+#: plugins/addons/addressbook/class_addressbook.inc:672
 #: plugins/admin/departments/class_departmentGeneric.inc:252
 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:1051
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/personal/generic/class_user.inc:1050
+#: plugins/addons/addressbook/class_addressbook.inc:675
 #: plugins/admin/departments/class_departmentGeneric.inc:255
 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:1054
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1053
+#: plugins/addons/addressbook/class_addressbook.inc:678
 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:1057
-#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/personal/generic/class_user.inc:1056
+#: plugins/addons/addressbook/class_addressbook.inc:681
 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:1185
+#: plugins/personal/generic/class_user.inc:1165
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
-#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1279
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1280
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1281
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1300
+#: plugins/personal/generic/class_user.inc:1282
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/class_user.inc:1283
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1284
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1285
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1286
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1288
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1289
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1290
 #: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1291
 #: plugins/personal/generic/generic.tpl:459
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:179
+#: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1295
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:91
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: include/class_acl.inc:164 html/getxls.php:89 html/getxls.php:90
+#: html/getxls.php:308
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1304
 #: plugins/personal/generic/generic.tpl:143
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:574
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/gofax/blocklists/generic.tpl:17
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:890
+#: plugins/admin/groups/class_groupGeneric.inc:892
 #: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/users/class_divListUsers.inc:141
 #: plugins/admin/applications/generic.tpl:42
 #: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:118
+#: plugins/admin/applications/class_divListApplication.inc:134
 #: plugins/admin/departments/generic.tpl:35
 #: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:90
+#: plugins/admin/departments/class_divListDepartment.inc:107
 #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
 #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
 #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:510
+#: plugins/admin/systems/class_terminalGeneric.inc:513
 #: plugins/admin/systems/class_servGeneric.inc:346
 #: plugins/admin/systems/class_workstationGeneric.inc:515
 #: plugins/admin/systems/wingeneric.tpl:13
@@ -2362,74 +2364,81 @@ msgstr "Benutzer"
 #: plugins/admin/systems/class_componentGeneric.inc:267
 #: plugins/admin/systems/class_glpiSelectUser.inc:167
 #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:148
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:700
+#: plugins/admin/ogroups/class_ogroup.inc:715
 #: plugins/admin/ogroups/class_divListOGroup.inc:145
 #: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:173
 #: plugins/admin/mimetypes/generic.tpl:44
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacro.inc:474
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
-#: plugins/gofon/conference/class_divListConferences.inc:93
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/class_gofonMacro.inc:484
+#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/conference/generic.tpl:49
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
+#: plugins/gofon/conference/class_divListConferences.inc:119
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
 msgid "Surename"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:1325
-#: plugins/addons/addressbook/class_addressbook.inc:520 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
 msgid "Given name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1308
+#: plugins/addons/addressbook/class_addressbook.inc:796
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1309
 #: plugins/personal/generic/generic.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/addons/addressbook/address_edit.tpl:60
+#: plugins/addons/addressbook/address_info.tpl:40
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1310
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1329 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1311
+#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/addons/addressbook/class_addressbook.inc:795
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1332
-#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/generic.tpl:250
+#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1315
 #: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
-#: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/addons/addressbook/address_edit.tpl:155
+#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/address_info.tpl:117
 #: plugins/admin/users/class_divListUsers.inc:56
 #: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/ogroups/class_ogroupManagement.inc:381
@@ -2439,34 +2448,35 @@ msgstr "Organisation"
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1316
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1317
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1318
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1319
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1338
+#: plugins/personal/generic/class_user.inc:1320
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1321
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1322
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/class_addressbook.inc:801
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -2475,51 +2485,57 @@ msgstr "Anstellungsart"
 #: plugins/admin/systems/class_workstationGeneric.inc:514
 #: plugins/admin/systems/class_printGeneric.inc:866
 #: plugins/admin/systems/class_glpiAccount.inc:782
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:174
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/class_user.inc:1323
 #: plugins/personal/generic/generic.tpl:360
+#: plugins/addons/addressbook/class_addressbook.inc:804
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:547
-#: html/getxls.php:174 html/getxls.php:236
+#: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:1342
-#: plugins/personal/generic/paste_generic.tpl:22
+#: plugins/personal/generic/class_user.inc:1324
+#: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1343
+#: plugins/personal/generic/class_user.inc:1325
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1344
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/addons/addressbook/class_addressbook.inc:792
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/addons/addressbook/class_addressbook.inc:794
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1346
+#: plugins/personal/generic/class_user.inc:1328
 #: plugins/personal/nagios/class_nagiosAccount.inc:271
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1347
+#: plugins/personal/generic/class_user.inc:1329
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
-#: plugins/personal/generic/class_user.inc:1349 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/addons/addressbook/class_addressbook.inc:802
+#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Postal address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1350
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/addons/addressbook/class_addressbook.inc:793
 msgid "Fax number"
 msgstr "Faxnummer"
 
@@ -2532,7 +2548,7 @@ msgstr "Persönliche Informationen"
 #: plugins/personal/generic/generic.tpl:38
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:50
+#: plugins/personal/generic/paste_generic.tpl:37
 msgid "Personal picture"
 msgstr "Bild"
 
@@ -2570,8 +2586,8 @@ msgstr "Kennung"
 msgid "Set"
 msgstr "Setzen"
 
-#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Sex"
 msgstr "Geschlecht"
 
@@ -2585,8 +2601,7 @@ msgid "Choose subtree to place user in"
 msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
 
 #: plugins/personal/generic/generic.tpl:153
-#: plugins/gofax/blocklists/generic.tpl:21
-#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:40
+#: plugins/gofax/blocklists/generic.tpl:26 plugins/admin/groups/generic.tpl:40
 #: plugins/admin/applications/generic.tpl:52
 #: plugins/admin/departments/generic.tpl:45
 #: plugins/admin/systems/terminal.tpl:28 plugins/admin/systems/server.tpl:32
@@ -2594,21 +2609,21 @@ msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
 #: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:41
+#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:62
 msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
 #: plugins/personal/generic/generic.tpl:167
 #: plugins/personal/generic/generic.tpl:368
-#: 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/addons/addressbook/address_edit.tpl:80
+#: plugins/addons/addressbook/address_edit.tpl:207
+#: plugins/addons/addressbook/address_info.tpl:59
+#: plugins/addons/addressbook/address_info.tpl:155
 #: plugins/admin/departments/generic.tpl:76
 #: plugins/admin/departments/class_departmentGeneric.inc:548
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr "Adresse"
 
@@ -2657,16 +2672,17 @@ msgstr "Zimmer-Nr."
 
 #: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:95
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:106
+#: plugins/addons/addressbook/address_info.tpl:75 html/getxls.php:299
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
 #: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:79
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:246
+#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
+#: html/getxls.php:300
 msgid "Pager"
 msgstr "Pager"
 
@@ -2686,14 +2702,14 @@ msgstr ""
 "gewünschten Verschlüsselung abgelegt werden kann."
 
 #: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
 msgid "Remove picture"
 msgstr "Bild entfernen"
 
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_edit.tpl:264
 #: plugins/admin/departments/class_departmentManagement.inc:294
 #: plugins/admin/systems/servdns.tpl:21
 #: plugins/admin/systems/servkolab.tpl:246
@@ -2722,17 +2738,17 @@ msgstr "Bild entfernen"
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/goVirusServer.tpl:169
 #: plugins/admin/systems/class_goService.inc:33
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:38
 #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:13
 msgid "Save"
 msgstr "Speichern"
 
-#: plugins/personal/generic/main.inc:99
+#: plugins/personal/generic/main.inc:102
 msgid "You are not allowed to set your password!"
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
 
-#: plugins/personal/generic/main.inc:184
+#: plugins/personal/generic/main.inc:191
 msgid "Generic user information"
 msgstr "Generische Benutzer-Information"
 
@@ -2744,9 +2760,9 @@ msgstr "Standard-Zertifikat"
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
 #: plugins/personal/connectivity/class_kolabAccount.inc:258
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:159
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:579
+#: plugins/admin/groups/class_groupMail.inc:594
 #: plugins/admin/applications/class_applicationParameters.inc:122
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/glpiPrinter.tpl:152
@@ -2758,8 +2774,9 @@ msgstr "Standard-Zertifikat"
 #: plugins/admin/systems/goMailServer.tpl:73
 #: plugins/admin/systems/goMailServer.tpl:104
 #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
+#: plugins/admin/fai/faiPackage.tpl:78
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2775,15 +2792,15 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/paste_generic.tpl:4
+#: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Benutzer-Einstellungen"
 
-#: plugins/personal/generic/paste_generic.tpl:35
+#: plugins/personal/generic/paste_generic.tpl:23
 msgid "Clear password"
 msgstr "Passwort löschen"
 
-#: plugins/personal/generic/paste_generic.tpl:36
+#: plugins/personal/generic/paste_generic.tpl:24
 msgid "Set new password"
 msgstr "Neues Passwort setzen"
 
@@ -2887,6 +2904,20 @@ msgstr "PHP GW"
 msgid "PHP GW account settings"
 msgstr "PHP GW Konto-Einstellungen"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:951
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:310
+#, fuzzy
+msgid "Connectivity addon"
+msgstr "Konnektivitäts-Konto"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
@@ -3263,7 +3294,7 @@ msgid "GB"
 msgstr "GB"
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:92
-#: plugins/addons/mailqueue/class_mailqueue.inc:323
+#: plugins/addons/mailqueue/class_mailqueue.inc:324
 msgid "hour"
 msgstr "Stunde"
 
@@ -3436,8 +3467,8 @@ msgid "The environment extension is currently disabled."
 msgstr "Die Umgebungs-Erweiterung ist zur Zeit deaktiviert."
 
 #: plugins/personal/environment/environment.tpl:14
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:191
+#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:198
 msgid "Environment managment settings"
 msgstr "Umgebungs-Einstellungen"
 
@@ -3445,116 +3476,116 @@ msgstr "Umgebungs-Einstellungen"
 msgid "Profile managment"
 msgstr "Profil-Verwaltung"
 
-#: plugins/personal/environment/environment.tpl:26
+#: plugins/personal/environment/environment.tpl:25
 msgid "Use profile managment"
 msgstr "Benutze Profil-Verwaltung"
 
-#: plugins/personal/environment/environment.tpl:33
+#: plugins/personal/environment/environment.tpl:32
 msgid "Profile server managment"
 msgstr "Profil-Server-Verwaltung"
 
-#: plugins/personal/environment/environment.tpl:36
+#: plugins/personal/environment/environment.tpl:35
 msgid "Profil path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/environment/environment.tpl:49
+#: plugins/personal/environment/environment.tpl:56
 msgid "Profil quota"
 msgstr "Profil-Kontingent"
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1253
+#: plugins/personal/environment/environment.tpl:73
+#: plugins/personal/environment/class_environment.inc:1282
 msgid "Cache profile localy"
 msgstr "Profil lokal zwischenspeichern"
 
-#: plugins/personal/environment/environment.tpl:75
+#: plugins/personal/environment/environment.tpl:82
 msgid "Kiosk profile settings"
 msgstr "Kiosk-Profil-Einstellungen"
 
-#: plugins/personal/environment/environment.tpl:78
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/environment.tpl:85
+#: plugins/personal/environment/class_environment.inc:1288
 msgid "Kiosk profile"
 msgstr "Kiosk-Profil"
 
-#: plugins/personal/environment/environment.tpl:88
+#: plugins/personal/environment/environment.tpl:95
 msgid "Manage"
 msgstr "Verwalten"
 
-#: plugins/personal/environment/environment.tpl:98
-#: plugins/personal/environment/class_environment.inc:1252
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/class_environment.inc:1281
 msgid "Resolution changeable during session"
 msgstr "Auflösung änderbar während des Betriebs"
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/environment.tpl:110
+#: plugins/personal/environment/class_environment.inc:1287
 #: plugins/admin/systems/workstationService.tpl:122
 #: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: plugins/personal/environment/environment.tpl:126
-#: plugins/personal/environment/class_environment.inc:1264
+#: plugins/personal/environment/environment.tpl:133
+#: plugins/personal/environment/class_environment.inc:1293
 #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1114
+#: plugins/admin/systems/class_workstationStartup.inc:1123
 #: plugins/admin/systems/workstationStartup.tpl:158
 #: plugins/admin/systems/terminalStartup.tpl:87
 #: plugins/admin/systems/goShareServer.tpl:1
 msgid "Shares"
 msgstr "Freigaben"
 
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:143
 msgid "User used to connect to the share"
 msgstr "Benutzer, der für die Verbindung zur Freigabe verwendet wird"
 
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:146
 msgid "Select a share"
 msgstr "Wählen Sie eine Freigabe"
 
-#: plugins/personal/environment/environment.tpl:147
+#: plugins/personal/environment/environment.tpl:154
 msgid "Mount path"
 msgstr "Einhänge-Pfad"
 
-#: plugins/personal/environment/environment.tpl:160
+#: plugins/personal/environment/environment.tpl:167
 msgid "Logon scripts"
 msgstr "Anmelde-Skripte"
 
-#: plugins/personal/environment/environment.tpl:162
+#: plugins/personal/environment/environment.tpl:169
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "Verwaltung der Anmelde-Skripte"
 
-#: plugins/personal/environment/environment.tpl:196
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/environment.tpl:203
+#: plugins/personal/environment/class_environment.inc:1292
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:198
+#: plugins/personal/environment/environment.tpl:205
 msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:212
+#: plugins/personal/environment/environment.tpl:219
 #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 msgid "New"
 msgstr "Neu"
 
-#: plugins/personal/environment/environment.tpl:215
+#: plugins/personal/environment/environment.tpl:222
 msgid "Existing"
 msgstr "Vorhanden"
 
-#: plugins/personal/environment/environment.tpl:230
+#: plugins/personal/environment/environment.tpl:237
 msgid "Printer settings"
 msgstr "Drucker-Einstellungen"
 
-#: plugins/personal/environment/environment.tpl:247
+#: plugins/personal/environment/environment.tpl:254
 msgid "Toggle admin"
 msgstr "Admin-Modus umschalten"
 
-#: plugins/personal/environment/environment.tpl:250
+#: plugins/personal/environment/environment.tpl:257
 msgid "Toggle default"
 msgstr "Standard umschalten"
 
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:120
 msgid "User environment settings"
 msgstr "Einstellungen der Benutzer-Umgebung"
 
@@ -3579,9 +3610,9 @@ msgstr ""
 "'0xFFFF')"
 
 #: plugins/personal/environment/class_hotplugDialog.inc:133
-#, fuzzy
 msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
-msgstr "Bitte geben Sie eine gültige PPD-Datei an."
+msgstr ""
+"Bitte geben Sie eine gültige Produkt-ID ein (2 Byte Hex, z.B. '0xFFFF')"
 
 #: plugins/personal/environment/class_hotplugDialog.inc:139
 msgid "An Entry with this name already exists."
@@ -3591,7 +3622,7 @@ msgstr "Ein Eintrag mit diesem Namen existiert bereits."
 msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/personal/environment/class_selectPrinterDialog.inc:102
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
@@ -3641,34 +3672,52 @@ msgstr ""
 "Sie haben einen Hook für das externe Beziehen von Auflösungen angegeben. "
 "Dieser kann nicht ausgeführt werden. Prüfsen Sie die Berechtigungen von '%s'."
 
-#: plugins/personal/environment/class_environment.inc:324
-#: plugins/personal/environment/class_environment.inc:362
+#: plugins/personal/environment/class_environment.inc:271
+#, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Setting profile "
+"server to '%s'."
+msgstr ""
+"Der ausgewählte Profil-Server '%s' ist nicht mehr verfügbar. Setze Profil-"
+"Server auf '%s'."
+
+#: plugins/personal/environment/class_environment.inc:276
+#, fuzzy, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Profile server "
+"configuration is resetted."
+msgstr ""
+"Das ausgewählte Kiosk-Profil '%s' ist nicht mehr verfügbar, die Einstellung "
+"wurde auf 'keins' zurückgesetzt."
+
+#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:383
 msgid "Remove environment extension"
 msgstr "Umgebungs-Erweiterung entfernen"
 
-#: plugins/personal/environment/class_environment.inc:325
-#: plugins/personal/environment/class_environment.inc:363
+#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:384
 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:334
-#: plugins/personal/environment/class_environment.inc:339
-#: plugins/personal/environment/class_environment.inc:368
-#: plugins/personal/environment/class_environment.inc:373
+#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
+#: plugins/personal/environment/class_environment.inc:389
+#: plugins/personal/environment/class_environment.inc:394
 msgid "Add environment extension"
 msgstr "Umgebungs-Erweiterung hinzufügen"
 
-#: plugins/personal/environment/class_environment.inc:335
-#: plugins/personal/environment/class_environment.inc:369
+#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:390
 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:340
-#: plugins/personal/environment/class_environment.inc:374
+#: plugins/personal/environment/class_environment.inc:361
+#: plugins/personal/environment/class_environment.inc:395
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -3677,44 +3726,44 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:477
-#: plugins/personal/environment/class_environment.inc:869
+#: plugins/personal/environment/class_environment.inc:498
+#: plugins/personal/environment/class_environment.inc:895
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "keine"
 
-#: plugins/personal/environment/class_environment.inc:491
+#: plugins/personal/environment/class_environment.inc:512
 msgid "You are not allowed to write Logon scripts."
 msgstr "Sie haben keine Berechtigung, Anmeldeskripte zu speichern."
 
-#: plugins/personal/environment/class_environment.inc:570
-#: plugins/personal/environment/class_environment.inc:583
+#: plugins/personal/environment/class_environment.inc:591
+#: plugins/personal/environment/class_environment.inc:604
 #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:615
+#: plugins/admin/systems/class_workstationStartup.inc:616
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:572
+#: plugins/personal/environment/class_environment.inc:593
 #, fuzzy
 msgid "Spaces are not allowed in the mount path!"
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
 
-#: plugins/personal/environment/class_environment.inc:645
-#: plugins/personal/environment/class_environment.inc:646
-#: plugins/personal/environment/class_environment.inc:654
-#: plugins/personal/environment/class_environment.inc:655
+#: plugins/personal/environment/class_environment.inc:672
+#: plugins/personal/environment/class_environment.inc:673
+#: plugins/personal/environment/class_environment.inc:681
+#: plugins/personal/environment/class_environment.inc:682
 msgid "Reset password hash"
 msgstr "Passwort zurücksetzen"
 
-#: plugins/personal/environment/class_environment.inc:659
+#: plugins/personal/environment/class_environment.inc:686
 msgid "Delete share entry"
 msgstr "Diesen Freigabe-Eintrag entfernen"
 
-#: plugins/personal/environment/class_environment.inc:848
+#: plugins/personal/environment/class_environment.inc:875
 msgid "GOsa default printer flag is not allowed within groups."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:872
+#: plugins/personal/environment/class_environment.inc:898
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
@@ -3723,16 +3772,16 @@ msgstr ""
 "Das ausgewählte Kiosk-Profil '%s' ist nicht mehr verfügbar, die Einstellung "
 "wurde auf 'keins' zurückgesetzt."
 
-#: plugins/personal/environment/class_environment.inc:911
+#: plugins/personal/environment/class_environment.inc:936
 #, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
 msgstr "Entfernen von Benutzer/Umgebungs-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/environment/class_environment.inc:980
+#: plugins/personal/environment/class_environment.inc:1005
 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:987
+#: plugins/personal/environment/class_environment.inc:1012
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -3740,47 +3789,47 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:1025
+#: plugins/personal/environment/class_environment.inc:1050
 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:1164
+#: plugins/personal/environment/class_environment.inc:1189
 #, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Umgebungs-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/environment/class_environment.inc:1177
+#: plugins/personal/environment/class_environment.inc:1202
 msgid "group share"
 msgstr "Gruppen-Freigabe"
 
-#: plugins/personal/environment/class_environment.inc:1210
+#: plugins/personal/environment/class_environment.inc:1238
 msgid "Administrator"
 msgstr "Administrator"
 
-#: plugins/personal/environment/class_environment.inc:1215
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1243
+#: plugins/personal/environment/class_environment.inc:1290
 msgid "Default printer"
 msgstr "Standard Drucker"
 
-#: plugins/personal/environment/class_environment.inc:1241
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Environment settings"
 msgstr "Umgebungs-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1248
+#: plugins/personal/environment/class_environment.inc:1277
 msgid "Command to extend the list of possible screen resolutions"
 msgstr "Befehl um die Liste der möglichen Auflösungen zu erweitern"
 
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1284
 msgid "Profile quota"
 msgstr "Profil-Kontingent"
 
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1285
 msgid "Profile server"
 msgstr "Profilserver"
 
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1291
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Anmelde-Skript"
@@ -3827,11 +3876,11 @@ msgstr "Skriptname"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:573
+#: plugins/gofax/blocklists/generic.tpl:51
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
 #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:891
+#: plugins/admin/groups/class_groupGeneric.inc:893
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/applications/class_applicationGeneric.inc:525
 #: plugins/admin/departments/generic.tpl:16
@@ -3849,34 +3898,38 @@ msgstr "Skriptname"
 #: plugins/admin/systems/class_goMailServer.inc:695
 #: plugins/admin/systems/class_goShareServer.inc:354
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:701
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/class_faiScript.inc:516
-#: plugins/admin/fai/class_faiTemplate.inc:460
-#: plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/ogroups/class_ogroup.inc:716
+#: plugins/admin/fai/faiVariable.tpl:21
+#: plugins/admin/fai/class_faiScript.inc:527
+#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/faiPackage.tpl:21
+#: plugins/admin/fai/faiPartitionTable.tpl:21
 #: plugins/admin/fai/class_faiScriptEntry.inc:180
 #: plugins/admin/fai/faiScriptEntry.tpl:19
-#: plugins/admin/fai/class_faiPackage.inc:556
-#: plugins/admin/fai/class_faiProfile.inc:446
-#: plugins/admin/fai/class_faiHook.inc:502 plugins/admin/fai/faiProfile.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/class_faiPackage.inc:537
+#: plugins/admin/fai/class_faiProfile.inc:452
+#: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:13
 #: plugins/admin/fai/faiScript.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:17
-#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:21
-#: plugins/admin/fai/class_faiHookEntry.inc:187
+#: plugins/admin/fai/class_faiVariableEntry.inc:143
+#: plugins/admin/fai/faiVariableEntry.tpl:19
+#: plugins/admin/fai/faiTemplate.tpl:21 plugins/admin/fai/faiHook.tpl:21
+#: plugins/admin/fai/class_faiPartitionTable.inc:529
+#: plugins/admin/fai/class_faiHookEntry.inc:189
 #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:393
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiTemplateEntry.inc:248
+#: plugins/admin/fai/faiTemplateEntry.tpl:13
 #: plugins/admin/mimetypes/generic.tpl:35
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/macro/class_gofonMacro.inc:475
-#: plugins/gofon/conference/generic.tpl:56
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
-#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
+#: plugins/gofon/macro/generic.tpl:49
+#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/conference/generic.tpl:78
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:158
+#: html/getxls.php:287
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -3898,30 +3951,30 @@ msgid "Script can be replaced by user"
 msgstr "Skript kann vom Benutzer ausgetauscht werden"
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/blocklists/generic.tpl:88
+#: plugins/gofax/blocklists/generic.tpl:103
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/addons/notifications/contents.tpl:12
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:332
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:503
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:54
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/admin/fai/class_faiManagement.inc:614
+#: plugins/admin/fai/class_faiManagement.inc:616
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:82
-#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiVariableEntry.tpl:54
 #: plugins/admin/fai/faiHookEntry.tpl:84
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:170
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
 #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
 #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
 msgid "Apply"
@@ -4177,7 +4230,7 @@ msgstr "Konfiguration anzeigen"
 msgid "View system informations"
 msgstr "System-Informationen anzeigen"
 
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
@@ -4252,15 +4305,19 @@ msgstr "Profil-Pfad"
 msgid "List name"
 msgstr "Listenname"
 
-#: plugins/gofax/blocklists/generic.tpl:10
+#: plugins/gofax/blocklists/generic.tpl:12
 msgid "Name of blocklist"
 msgstr "Name der Sperrliste"
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
+#: plugins/gofax/blocklists/generic.tpl:20 plugins/admin/groups/generic.tpl:34
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:26
+#: plugins/admin/systems/phone.tpl:20 plugins/admin/systems/workstation.tpl:30
+#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
+#: plugins/gofon/macro/generic.tpl:30
+msgid "Choose subtree to place group in"
+msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
 
-#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/gofax/blocklists/generic.tpl:40
 #: plugins/admin/systems/servnfs.tpl:56
 #: plugins/admin/systems/workstationService.tpl:54
 #: plugins/admin/systems/workstationService.tpl:156
@@ -4273,25 +4330,25 @@ msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/class_goShareServer.inc:355
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
 #: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
 msgid "Type"
 msgstr "Typ"
 
-#: plugins/gofax/blocklists/generic.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Wählen Sie, ob ein- oder abgehende Rufe gefiltert werden sollen"
 
-#: plugins/gofax/blocklists/generic.tpl:48
+#: plugins/gofax/blocklists/generic.tpl:54
 msgid "Descriptive text for this blocklist"
 msgstr "Beschreibender Text zu dieser Sperrliste"
 
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/gofax/blocklists/generic.tpl:68
 msgid "Blocked numbers"
 msgstr "Gesperrte Nummern"
 
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:92
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
@@ -4335,7 +4392,7 @@ msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
 
@@ -4352,60 +4409,54 @@ msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
 msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:409
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
 #, php-format
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Entfernen von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:449
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
 #: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:465
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:472
-msgid "No permission to create a blocklist on this base."
-msgstr ""
-"Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
-"anzulegen."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:520
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
 #, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Speichern von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:560
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
 msgid "Fax Blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:572
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/groups/class_groupGeneric.inc:889
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/address_info.tpl:24
+#: plugins/admin/groups/class_groupGeneric.inc:891
 #: plugins/admin/applications/class_applicationGeneric.inc:523
 #: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:514
 #: plugins/admin/systems/class_servGeneric.inc:343
 #: plugins/admin/systems/class_printGeneric.inc:863
 #: plugins/admin/systems/class_componentGeneric.inc:266
@@ -4429,34 +4480,44 @@ msgstr "Fax-Sperrlisten"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/admin/systems/class_goShareServer.inc:352
-#: plugins/admin/ogroups/class_ogroup.inc:699
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:714
 #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:515
-#: plugins/admin/fai/class_faiTemplate.inc:459
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiScriptEntry.inc:179
 #: plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/class_faiPackage.inc:555
-#: plugins/admin/fai/class_faiProfile.inc:445
-#: plugins/admin/fai/class_faiHook.inc:501 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:536
+#: plugins/admin/fai/class_faiProfile.inc:451
+#: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/class_faiVariableEntry.inc:142
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/class_faiPartitionTable.inc:498
-#: plugins/admin/fai/class_faiHookEntry.inc:186
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiHookEntry.inc:188
 #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:392
+#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiTemplateEntry.inc:247
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:313
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: plugins/gofon/macro/parameter.tpl:6
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:575
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+msgid "Blocklist"
+msgstr "Sperrliste"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
 msgid "Blocklist type"
 msgstr "Typ der Sperrliste"
 
@@ -4520,6 +4581,7 @@ msgstr "Zeige eingehende Sperrlisten"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
 #: plugins/admin/acl/class_divListACL.inc:57
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
@@ -4532,243 +4594,242 @@ msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
 msgid "Regular expression for matching list names"
 msgstr "Regulärer Ausdruck zum Erkennen von Sperrlisten-Namen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:122
 #: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:98
+#: plugins/gofon/conference/class_divListConferences.inc:97
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/addons/godfs/class_dfsManagment.inc:214
 #: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:122
 #: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:98
+#: plugins/gofon/conference/class_divListConferences.inc:97
 msgid "Root"
 msgstr "Wurzel"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/users/class_divListUsers.inc:119
+#: plugins/admin/applications/class_divListApplication.inc:119
+#: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/class_glpiSelectUser.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:130
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:99
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/addons/godfs/class_dfsManagment.inc:213
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/users/class_divListUsers.inc:119
+#: plugins/admin/applications/class_divListApplication.inc:119
+#: plugins/admin/departments/class_divListDepartment.inc:92
 #: plugins/admin/systems/class_glpiSelectUser.inc:163
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:130
 #: plugins/admin/ogroups/phonequeue.tpl:20
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:299
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: plugins/admin/fai/class_faiProfile.inc:304
+#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: include/class_acl.inc:368
 msgid "Up"
 msgstr "Auf"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:121
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:132
 #: plugins/admin/ogroups/class_divListOGroup.inc:126
 #: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:102
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:121
+#: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:132
 #: plugins/admin/ogroups/class_divListOGroup.inc:126
 #: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:124
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:102
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Home"
 msgstr "Heimat"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/departments/class_divListDepartment.inc:79
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:133
 #: plugins/admin/ogroups/class_divListOGroup.inc:128
 #: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:126
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/admin/fai/class_divListFai.inc:141
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
+#: plugins/gofon/macro/class_divListMacros.inc:104
+#: plugins/gofon/conference/class_divListConferences.inc:103
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
 #: plugins/addons/godfs/class_dfsManagment.inc:218
 #: plugins/admin/groups/class_divListGroup.inc:123
 #: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:79
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:136
+#: plugins/admin/departments/class_divListDepartment.inc:96
+#: plugins/admin/departments/class_divListDepartment.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_glpiSelectUser.inc:170
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:121
+#: plugins/admin/systems/class_divListSystem.inc:133
+#: plugins/admin/systems/class_divListSystem.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/admin/acl/class_divListACL.inc:88
 #: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:127
-#: plugins/admin/fai/class_divListFai.inc:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:174
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/gofon/macro/class_divListMacros.inc:104
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/gofon/conference/class_divListConferences.inc:121
 msgid "Submit"
 msgstr "Übertragen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "New Blocklist"
 msgstr "Neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
 #: plugins/addons/godfs/class_dfsManagment.inc:218
 #: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:136
+#: plugins/admin/departments/class_divListDepartment.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:121
+#: plugins/admin/systems/class_divListSystem.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: plugins/admin/fai/class_divListFai.inc:174
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/conference/class_divListConferences.inc:121
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
+#: plugins/admin/groups/class_divListGroup.inc:206
+#: plugins/admin/users/class_divListUsers.inc:255
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/departments/class_divListDepartment.inc:133
 #: plugins/admin/systems/glpiPrinter.tpl:18
 #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
 #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:192
 #: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:276
-#: plugins/admin/fai/class_faiScript.inc:278
-#: plugins/admin/fai/class_faiTemplate.inc:236
-#: plugins/admin/fai/class_faiTemplate.inc:239
-#: plugins/admin/fai/class_faiHook.inc:260
-#: plugins/admin/fai/class_faiHook.inc:263
-#: plugins/admin/fai/class_divListFai.inc:226
-#: plugins/admin/fai/class_divListFai.inc:229
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/macro/class_divListMacros.inc:109
-#: plugins/gofon/macro/class_divListMacros.inc:128
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/fai/class_faiScript.inc:283
+#: plugins/admin/fai/class_faiScript.inc:285
+#: plugins/admin/fai/class_faiTemplate.inc:257
+#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/fai/class_faiHook.inc:294
+#: plugins/admin/fai/class_faiHook.inc:296
+#: plugins/admin/fai/class_divListFai.inc:241
+#: plugins/admin/fai/class_divListFai.inc:244
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
+#: plugins/gofon/macro/class_divListMacros.inc:131
+#: plugins/gofon/macro/class_divListMacros.inc:159
+#: plugins/gofon/conference/class_divListConferences.inc:159
 #: include/class_acl.inc:370 include/class_acl.inc:415
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/users/class_divListUsers.inc:250
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
+#: plugins/admin/users/class_divListUsers.inc:256
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/users/class_divListUsers.inc:266
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:192
 #: plugins/admin/ogroups/class_divListOGroup.inc:200
 #: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:280
-#: plugins/admin/fai/class_faiTemplate.inc:240
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_divListFai.inc:237
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/macro/class_divListMacros.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/fai/class_faiScript.inc:287
+#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/admin/fai/class_faiHook.inc:298
+#: plugins/admin/fai/class_divListFai.inc:252
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
+#: plugins/gofon/macro/class_divListMacros.inc:133
+#: plugins/gofon/macro/class_divListMacros.inc:167
+#: plugins/gofon/conference/class_divListConferences.inc:169
 #: include/class_acl.inc:371 include/class_acl.inc:416
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
-#: plugins/admin/users/class_divListUsers.inc:267
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
@@ -4778,10 +4839,10 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
 
 #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
 #: plugins/admin/ogroups/phonequeue.tpl:47
-#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Language"
 msgstr "Sprache"
 
@@ -4790,7 +4851,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Geben Sie die Kommunikations-Sprache für das Fax to Mail-Gateway an"
 
 #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Auslieferungsformat"
 
@@ -4811,12 +4872,12 @@ msgid "Deliver fax as mail to"
 msgstr "Fax als Mail ausliefern an"
 
 #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Deliver fax as mail"
 msgstr "Als Mail ausliefern"
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Fax an Drucker weiterleiten"
 
@@ -4872,26 +4933,26 @@ msgstr "Liste von vordefinierten Sperrlisten"
 msgid "Add the list to the blocklists"
 msgstr "Liste zu den Sperrlisten hinzufügen"
 
-#: plugins/gofax/faxaccount/main.inc:98
+#: plugins/gofax/faxaccount/main.inc:110
 msgid "FAX settings"
 msgstr "Fax-Einstellungen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
-#: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_info.tpl:171
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:140
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:143
 msgid "This account has no fax extensions."
 msgstr "Dieses Konto besitzt keine Fax-Erweiterungen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
 msgid "Remove fax account"
 msgstr "Fax-Konto entfernen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -4899,11 +4960,11 @@ msgstr ""
 "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:152
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
 msgid "Create fax account"
 msgstr "Fax-Konto erzeugen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -4911,40 +4972,40 @@ msgstr ""
 "Aktuell besitzt 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:216
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:219
 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:425
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:506
-#: plugins/admin/groups/class_groupApplication.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:428
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:509
+#: plugins/admin/groups/class_groupApplication.inc:672
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "zurück"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:618
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:621
 #, php-format
 msgid "Removing of user/fax account with dn '%s' failed."
 msgstr "Entfernen von Benutzer/Fax-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:633
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
 msgid "The required field 'Fax' is not set."
 msgstr "Das benötigte Feld 'Fax' ist nicht gesetzt."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 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:645
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:650
 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:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:656
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -4952,28 +5013,28 @@ msgstr ""
 "'Fax an Drucker weiterleiten' ist nur möglich, wenn ein gültiger Drucker "
 "angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:735
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:741
 #, php-format
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Fax-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:806
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:812
 msgid "Fax account settings"
 msgstr "Fax-Konto-Einstellungen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
 msgid "Enable/Disable fax"
 msgstr "FAX aktivieren/deaktivieren"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:816
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
 msgid "Receive blocklist"
 msgstr "Emfangs-Sperrliste"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
 msgid "Send blocklist"
 msgstr "Sende-Sperrliste"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
 msgid "Alternate fax number"
 msgstr "Alternative Fax-Nummer"
 
@@ -4984,7 +5045,7 @@ msgid "Filter"
 msgstr "Filter"
 
 #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/addressbook/contents.tpl:106
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
@@ -5014,7 +5075,7 @@ msgid "during"
 msgstr "während"
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
+#: plugins/addons/logview/contents.tpl:68
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
@@ -5025,13 +5086,15 @@ msgstr "Suchen"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/systems/class_printGeneric.inc:842
 #: plugins/admin/ogroups/class_ogroupManagement.inc:378
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/fai/faiTemplateEntry.tpl:110
 msgid "User"
 msgstr "Benutzer"
 
 #: plugins/gofax/faxreports/contents.tpl:31
+#: plugins/gofax/faxreports/class_faxreport.inc:481
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: plugins/gofon/fonreports/class_fonreport.inc:398
 msgid "Date"
 msgstr "Datum"
 
@@ -5072,18 +5135,22 @@ msgid "Date / Time"
 msgstr "Datum / Zeit"
 
 #: plugins/gofax/faxreports/detail.tpl:29
+#: plugins/gofax/faxreports/class_faxreport.inc:484
 msgid "Sender MSN"
 msgstr "Absender-MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:33
+#: plugins/gofax/faxreports/class_faxreport.inc:483
 msgid "Sender ID"
 msgstr "Absender-ID"
 
 #: plugins/gofax/faxreports/detail.tpl:37
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 msgid "Receiver MSN"
 msgstr "Empfänger-MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:41
+#: plugins/gofax/faxreports/class_faxreport.inc:485
 msgid "Receiver ID"
 msgstr "Empfänger-ID"
 
@@ -5092,10 +5159,11 @@ msgid "Status message"
 msgstr "Status-Nachricht"
 
 #: plugins/gofax/faxreports/detail.tpl:53
+#: plugins/gofax/faxreports/class_faxreport.inc:489
 msgid "Transfer time"
 msgstr "Übertragungszeit"
 
-#: plugins/gofax/faxreports/main.inc:18
+#: plugins/gofax/faxreports/main.inc:14
 msgid "FAX reports"
 msgstr "Fax-Berichte"
 
@@ -5103,53 +5171,86 @@ msgstr "Fax-Berichte"
 msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
+#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:117
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
 "angezeigt werden!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/addons/logview/class_logview.inc:75
+#: plugins/gofon/fonreports/class_fonreport.inc:163
 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:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
+#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:126
 msgid "Can't select fax database for report generation!"
 msgstr "Kann die Fax-Datenbank zur Berichterstellung nicht öffnen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:266
+#: plugins/gofax/faxreports/class_faxreport.inc:149
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:157
+#: plugins/gofax/faxreports/class_faxreport.inc:158
+#: plugins/gofax/faxreports/class_faxreport.inc:168
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-#: plugins/gofon/fonreports/class_fonreport.inc:202
+#: plugins/gofax/faxreports/class_faxreport.inc:196
+#: plugins/gofax/faxreports/class_faxreport.inc:311
+#: plugins/gofon/fonreports/class_fonreport.inc:221
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:389
-#: plugins/gofax/faxreports/class_faxreport.inc:390
+#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+msgid "Insufficient permissions to view this attribute"
+msgstr "Zugriffsrechte nicht ausreichend um das Attribut anzuzeigen"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/admin/groups/class_groupApplication.inc:427
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+#, fuzzy
+msgid "Insufficient permissions"
+msgstr "Datei-Berechtigungen"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:469
+#: plugins/gofax/faxreports/class_faxreport.inc:470
 msgid "Fax report"
 msgstr "Fax-Bericht"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:399
+#: plugins/gofax/faxreports/class_faxreport.inc:470
+msgid "All entries are readonly"
+msgstr "Alle Einträge sind nur lesbar"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:479
 msgid "Detailed view"
 msgstr "Detaillierte Ansicht"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:480
+msgid "Fax ID"
+msgstr "Fax-ID"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:481
+msgid "Time"
+msgstr "Zeit"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:487
+msgid "Number of pages"
+msgstr "Anzahl der Seiten"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:488
+msgid "Status Message"
+msgstr "Status-Nachricht"
+
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_info.tpl:53
 msgid "Private"
 msgstr "Privat"
 
@@ -5167,48 +5268,48 @@ msgstr ""
 "Mitarbeiter Ihrer Organisation. Bei Eingaben wie 'gon' wird dementsprechend "
 "sowohl 'Gonicus' als auch 'gone' gefunden."
 
-#: plugins/addons/addressbook/contents.tpl:47
+#: plugins/addons/addressbook/contents.tpl:48
 msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
-#: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:743
+#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/admin/groups/class_groupApplication.inc:754
 msgid "Edit entry"
 msgstr "Eintrag bearbeiten"
 
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:55
 msgid "Remove entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Select to see regular users"
 msgstr "Wählen Sie dies, um gewöhnliche Benutzer anzuzeigen"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Show organizational entries"
 msgstr "Zeige Benutzer der Organisation"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Select to see users in addressbook"
 msgstr "Wählen, um Adressbucheinträge zu sehen"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Show addressbook entries"
 msgstr "Zeige Adressbuch-Einträge"
 
-#: plugins/addons/addressbook/contents.tpl:77
+#: plugins/addons/addressbook/contents.tpl:81
 msgid "Display results for department"
 msgstr "Zeige Ergebnisse der Abteilung"
 
-#: plugins/addons/addressbook/contents.tpl:90
+#: plugins/addons/addressbook/contents.tpl:94
 msgid "Match object"
 msgstr "Untersuchtes Objekt"
 
-#: plugins/addons/addressbook/contents.tpl:93
+#: plugins/addons/addressbook/contents.tpl:97
 msgid "Choose the object that will be searched in"
 msgstr "Wählen Sie das Objekt, auf das die Suchfunktion angewandt wird"
 
-#: plugins/addons/addressbook/contents.tpl:105
+#: plugins/addons/addressbook/contents.tpl:109
 msgid "Search string"
 msgstr "Suchtext"
 
@@ -5217,10 +5318,10 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:374
-#: plugins/addons/addressbook/class_addressbook.inc:378
-#: plugins/addons/addressbook/class_addressbook.inc:460
+#: plugins/addons/addressbook/class_addressbook.inc:427
+#: plugins/addons/addressbook/class_addressbook.inc:434
+#: plugins/addons/addressbook/class_addressbook.inc:438
+#: plugins/addons/addressbook/class_addressbook.inc:551
 msgid "Dial"
 msgstr "Wähle"
 
@@ -5239,58 +5340,61 @@ 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:24
-#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_info.tpl:18
 msgid "Personal"
 msgstr "Persönlich"
 
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
+#: html/getxls.php:298
 msgid "Initials"
 msgstr "Initialien"
 
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:118
+#: plugins/addons/addressbook/address_info.tpl:83
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:134
+#: plugins/addons/addressbook/address_info.tpl:99
 msgid "Organizational"
 msgstr "Organisationsbezogen"
 
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:143
+#: plugins/addons/addressbook/address_info.tpl:109
 msgid "Company"
 msgstr "Firma"
 
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:167
+#: plugins/addons/addressbook/address_info.tpl:125 html/getxls.php:225
+#: html/getxls.php:298
 msgid "City"
 msgstr "Stadt"
 
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:191
+#: plugins/addons/addressbook/address_info.tpl:141
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Country"
 msgstr "Land"
 
-#: plugins/addons/addressbook/main.inc:37
+#: plugins/addons/addressbook/main.inc:35
 msgid "Address book"
 msgstr "Adressbuch"
 
 #: plugins/addons/addressbook/class_addressbook.inc:6
+#: plugins/addons/addressbook/class_addressbook.inc:781
+#: plugins/addons/addressbook/class_addressbook.inc:787
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:160
+#: plugins/addons/addressbook/class_addressbook.inc:172
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:164
+#: plugins/addons/addressbook/class_addressbook.inc:176
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -5298,82 +5402,89 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:657
+#: plugins/addons/addressbook/class_addressbook.inc:202
+#: plugins/addons/addressbook/class_addressbook.inc:751
 #, php-format
 msgid "Removing of addressbook entry '%s' failed."
 msgstr "Entfernen von Adressbuch-Eintrag '%s' fehlgeschlagen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:194
-#: plugins/addons/addressbook/class_addressbook.inc:295
+#: plugins/addons/addressbook/class_addressbook.inc:209
+#: plugins/addons/addressbook/class_addressbook.inc:318
 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:289
+#: plugins/addons/addressbook/class_addressbook.inc:312
 #, 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:384
+#: plugins/addons/addressbook/class_addressbook.inc:444
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:388
+#: plugins/addons/addressbook/class_addressbook.inc:450
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:563
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:566
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:479
+#: plugins/addons/addressbook/class_addressbook.inc:570
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/logview/class_logview.inc:94
-#: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:305
-#: plugins/addons/mailqueue/class_mailqueue.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/logview/class_logview.inc:112
+#: plugins/addons/logview/class_logview.inc:133
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:702
 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:612
-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."
+#: plugins/addons/addressbook/class_addressbook.inc:782
+#, fuzzy
+msgid "Addressbook entry acls"
+msgstr "Speichern des Adressbucheintrags ist fehlgeschlagen"
+
+#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+msgid "Title"
+msgstr "Titel"
+
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
+msgid "Common name"
+msgstr "Name"
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
 msgid ""
@@ -5411,7 +5522,7 @@ msgstr "Statusreport des Imports:"
 msgid "Selected Template"
 msgstr "Gewählte Vorlage"
 
-#: plugins/addons/ldapmanager/main.inc:40
+#: plugins/addons/ldapmanager/main.inc:34
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr "LDAP-Manager"
@@ -5421,51 +5532,51 @@ msgstr "LDAP-Manager"
 msgid "LDIF export"
 msgstr "LDIF exportieren"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:101
+#: plugins/addons/ldapmanager/class_csvimport.inc:98
 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:161
+#: plugins/addons/ldapmanager/class_csvimport.inc:159
 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:209
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "failed"
 msgstr "Fehlgeschlagen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:213
+#: plugins/addons/ldapmanager/class_csvimport.inc:211
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:277
+#: plugins/addons/ldapmanager/class_csvimport.inc:275
 msgid "status"
 msgstr "Status"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:281
+#: plugins/addons/ldapmanager/class_csvimport.inc:279
 #, 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:319
+#: plugins/addons/ldapmanager/class_csvimport.inc:317
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: 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
+#: plugins/addons/ldapmanager/class_csvimport.inc:329
+#: plugins/addons/ldapmanager/class_csvimport.inc:340
+#: plugins/addons/ldapmanager/class_csvimport.inc:345
+#: plugins/addons/ldapmanager/class_import.inc:61
+#: plugins/addons/ldapmanager/class_import.inc:69
 msgid "There is no file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:336
-#: plugins/addons/ldapmanager/class_import.inc:55
+#: plugins/addons/ldapmanager/class_csvimport.inc:334
+#: plugins/addons/ldapmanager/class_import.inc:54
 msgid "The specified file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:490
+#: plugins/addons/ldapmanager/class_csvimport.inc:488
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Die gewählte Datei enthält keine CSV Daten..."
 
@@ -5504,12 +5615,11 @@ msgstr "Enferne zunächst bereits existierende Einträge"
 msgid "Import successful"
 msgstr "Import erfolgreich"
 
-#: plugins/addons/ldapmanager/class_import.inc:41
-msgid "You've no permission to do LDAP imports."
+#: plugins/addons/ldapmanager/class_import.inc:45
+msgid "You need full access to all objects, to execute the import command."
 msgstr ""
-"Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu importieren."
 
-#: plugins/addons/ldapmanager/class_import.inc:108
+#: plugins/addons/ldapmanager/class_import.inc:102
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
@@ -5558,21 +5668,29 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
 
+#: plugins/addons/ldapmanager/class_ldif.inc:35
+msgid "Ldap manager"
+msgstr "LDAP-Manager"
+
+#: plugins/addons/ldapmanager/class_ldif.inc:41
+msgid "Ldap manager addon"
+msgstr "LDAP-Manager Erweiterung"
+
 #: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "CSV-Import"
 
-#: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-msgid "You've no permission to do LDAP exports."
-msgstr ""
-"Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
-
-#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_export.inc:77
 #: 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/class_export.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#, php-format
+msgid "You are not allowed to export the given ldap entry (%s)"
+msgstr "Sie haben keine Berechtigung diesen Eintrag zu exportieren (%s)"
+
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
 msgid ""
 "The XLS export plugin provides methods to download a complete snapshot of "
@@ -5637,69 +5755,89 @@ msgstr "Hostname"
 msgid "Message"
 msgstr "Nachricht"
 
-#: plugins/addons/logview/main.inc:33
+#: plugins/addons/logview/main.inc:36
 msgid "System log view"
 msgstr "Systemprotokolle"
 
 #: plugins/addons/logview/class_logview.inc:6
+#: plugins/addons/logview/class_logview.inc:390
 msgid "System logs"
 msgstr "Systemprotokolle"
 
-#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:71
 msgid "No LOG servers defined!"
 msgstr "Keine LOG-Server definiert!"
 
-#: plugins/addons/logview/class_logview.inc:73
-#: plugins/addons/logview/class_logview.inc:168
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:182
 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
+#: plugins/addons/logview/class_logview.inc:92
+#: plugins/addons/logview/class_logview.inc:185
 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:86
-#: plugins/addons/logview/class_logview.inc:103
+#: plugins/addons/logview/class_logview.inc:104
+#, fuzzy
+msgid "Query for log database failed!. Requesting host names failed."
+msgstr "Die Anfrage zur LOG-Datenbank ist fehlgeschlagen!"
+
+#: plugins/addons/logview/class_logview.inc:125
 msgid "Query for log database failed!"
 msgstr "Die Anfrage zur LOG-Datenbank ist fehlgeschlagen!"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "one hour"
 msgstr "eine Stunde"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "6 hours"
 msgstr "6 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "24 hours"
 msgstr "24 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "2 days"
 msgstr "2 Tage"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "one week"
 msgstr "eine Woche"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "2 weeks"
 msgstr "2 Wochen"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "one month"
 msgstr "ein Monat"
 
+#: plugins/addons/logview/class_logview.inc:163
+#, fuzzy
+msgid "You have insufficient permissions to view syslog entries."
+msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
+
+#: plugins/addons/logview/class_logview.inc:384
+#, fuzzy
+msgid "Log view"
+msgstr "Protokoll-Dienst"
+
+#: plugins/addons/logview/class_logview.inc:385
+#, fuzzy
+msgid "Log view addon"
+msgstr "Nach unten bewegen"
+
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr "Bitte geben Sie einen Such-String ein."
@@ -5725,6 +5863,7 @@ msgid "Remove all messages from selected servers queue"
 msgstr "Entferne alle Nachrichten aus der Warteschlange des gewählten Servers"
 
 #: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/class_mailqueue.inc:394
 msgid "Hold all messages"
 msgstr "Alle Nachrichten vorhalten"
 
@@ -5741,6 +5880,7 @@ msgid "Release all messages in selected servers queue"
 msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers freigeben"
 
 #: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/class_mailqueue.inc:396
 msgid "Requeue all messages"
 msgstr "Alle Nachrichten wieder einreihen"
 
@@ -5770,7 +5910,7 @@ msgid "Error"
 msgstr "Fehler"
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Active"
 msgstr "Aktiv"
 
@@ -5791,6 +5931,7 @@ msgid "hold"
 msgstr "vorhalten"
 
 #: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/class_mailqueue.inc:398
 msgid "Hold message"
 msgstr "Nachricht vorhalten"
 
@@ -5810,7 +5951,7 @@ msgstr "Kopfzeilen"
 msgid "Display header from this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
 
-#: plugins/addons/mailqueue/main.inc:38
+#: plugins/addons/mailqueue/main.inc:42
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Mail-Warteschlange"
@@ -5825,7 +5966,7 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
-#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#: plugins/addons/mailqueue/class_mailqueue.inc:199
 #, php-format
 msgid ""
 "You do not have permission to execute the command '%s' on the mailqueue."
@@ -5836,44 +5977,91 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:121
 #: plugins/addons/mailqueue/class_mailqueue.inc:181
-#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#: plugins/addons/mailqueue/class_mailqueue.inc:214
 #, 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:225
+#: plugins/addons/mailqueue/class_mailqueue.inc:226
 msgid "There are no mail server specified."
 msgstr "Es wurden keine Mail-Server angegeben."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:275
+#: plugins/addons/mailqueue/class_mailqueue.inc:276
 msgid "up"
 msgstr "auf"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:277
+#: plugins/addons/mailqueue/class_mailqueue.inc:278
 msgid "down"
 msgstr "ab"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:320
+#: plugins/addons/mailqueue/class_mailqueue.inc:321
 msgid "no limit"
 msgstr "keine Beschränkung"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/addons/mailqueue/class_mailqueue.inc:326
 msgid "hours"
 msgstr "Stunden"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:371
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Hold"
 msgstr "Vorhalten"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:372
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Un hold"
 msgstr "Vorhalten aufheben"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:374
+#: plugins/addons/mailqueue/class_mailqueue.inc:375
 msgid "Not active"
 msgstr "inaktiv"
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:384
+#, fuzzy
+msgid "Mailqueue"
+msgstr "Mail-Warteschlange"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:385
+#, fuzzy
+msgid "Mailqueue addon"
+msgstr "Mail-Warteschlange"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:390
+#, fuzzy
+msgid "Mail queue addon"
+msgstr "Mail-Warteschlange"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:393
+#, fuzzy
+msgid "Unhold all messages"
+msgstr "Alle Nachrichten vorhalten"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:395
+#, fuzzy
+msgid "Delete all messages"
+msgstr "Alle Nachrichten freigeben"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:397
+#, fuzzy
+msgid "Unhold message"
+msgstr "Nachricht vorhalten"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:399
+msgid "Delete message"
+msgstr "Entferne Nachricht"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:400
+#, fuzzy
+msgid "Requeue message"
+msgstr "Diese Nachricht wieder einreihen"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:401
+msgid "Gathering queue data"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:402
+msgid "Get header information"
+msgstr "Hole Kopfzeilen"
+
 #: plugins/addons/godfs/contents.tpl:8
 msgid "DFS Shares"
 msgstr "DFS-Freigaben"
@@ -5942,7 +6130,7 @@ msgid "Create new dfsshare"
 msgstr "Neue DFS-Freigabe erstellen"
 
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
+#: ihtml/themes/default/copyPasteDialog.tpl:22
 msgid "Finish"
 msgstr "Speichern"
 
@@ -5992,8 +6180,8 @@ msgstr "Meldungen"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:886 include/class_acl.inc:164
-#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
+#: plugins/admin/groups/class_groupGeneric.inc:888 include/class_acl.inc:164
+#: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -6075,14 +6263,14 @@ msgstr ""
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:621
-#: plugins/admin/fai/class_faiManagement.inc:627
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/fai/class_faiManagement.inc:629
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Continue"
 msgstr "Fortsetzen"
 
@@ -6120,7 +6308,7 @@ msgstr "Zeige die Adressen, auf die das Folgende passt"
 
 #: plugins/admin/groups/generic.tpl:6 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:689
 msgid "Group name"
 msgstr "Gruppenname"
 
@@ -6132,13 +6320,6 @@ msgstr "UNIX-Name der Gruppe"
 msgid "Descriptive text for this group"
 msgstr "Beschreibender Text für diese Gruppe"
 
-#: plugins/admin/groups/generic.tpl:34 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/server.tpl:26 plugins/admin/systems/phone.tpl:20
-#: plugins/admin/systems/workstation.tpl:30
-#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
 #: plugins/admin/groups/generic.tpl:53
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
@@ -6187,13 +6368,13 @@ msgstr ""
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
-#: plugins/admin/groups/class_groupManagement.inc:241
+#: plugins/admin/groups/class_groupManagement.inc:243
 #, 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:247
-#: plugins/admin/groups/class_groupManagement.inc:278
+#: plugins/admin/groups/class_groupManagement.inc:249
+#: plugins/admin/groups/class_groupManagement.inc:281
 msgid "You are not allowed to delete this group!"
 msgstr "Sie haben keine Berechtigung, diese Gruppe zu löschen!"
 
@@ -6203,36 +6384,36 @@ msgstr ""
 "Die SID dieser Gruppe kann weder im LDAP noch in der Konfigurationsdatei "
 "gefunden werden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:173
+#: plugins/admin/groups/class_groupGeneric.inc:175
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:326
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:331
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:444
 msgid "! unknown id"
 msgstr "! unbekannte id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:481
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6240,30 +6421,30 @@ msgstr ""
 "Ihre Such-Methode ergab mehr als '%s' Benutzer, es werden davon '%s' "
 "Benutzer angezeigt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:508
-#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/groups/class_groupGeneric.inc:510
+#: plugins/admin/groups/class_groupGeneric.inc:718
 #, php-format
 msgid "Removing of groups/generic with dn '%s' failed."
 msgstr "Entfernen von Gruppe/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:628
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr "Keine konfigurierte SID für %s gefunden"
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:633
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr "Keine konfigurierte RIDBASE für '%s' gefunden."
 
-#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:744
 #: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:593
+#: plugins/admin/ogroups/class_ogroup.inc:608
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:754
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -6271,38 +6452,38 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
+#: plugins/admin/groups/class_groupGeneric.inc:765
+#: plugins/admin/groups/class_groupGeneric.inc:779
+#: plugins/admin/groups/class_groupGeneric.inc:786
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: plugins/admin/groups/class_groupGeneric.inc:881
+#: plugins/admin/groups/class_groupGeneric.inc:883
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:893
+#: plugins/admin/groups/class_groupGeneric.inc:895
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Mitglieder sind in einer Telefon-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:894
+#: plugins/admin/groups/class_groupGeneric.inc:896
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:899
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:900
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_groupGeneric.inc:899
+#: plugins/admin/groups/class_groupGeneric.inc:901
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:902
 msgid "Samba SID"
 msgstr "Samba SID"
 
@@ -6326,81 +6507,90 @@ msgstr "Kategorie hinzufügen"
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:565
+#: plugins/admin/groups/class_groupMail.inc:285 include/class_acl.inc:565
 #: include/class_acl.inc:656
 msgid "read"
 msgstr "lesen"
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "post"
 msgstr "posten"
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "external post"
 msgstr "extern posten"
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:566
+#: plugins/admin/groups/class_groupMail.inc:289 include/class_acl.inc:566
 #: include/class_acl.inc:658
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Dieser 'DN' hat keine Mail-Erweiterungen."
 
-#: plugins/admin/groups/class_groupMail.inc:394
+#: plugins/admin/groups/class_groupMail.inc:349
+#, fuzzy
+msgid "Remove shared folder from mail server database"
+msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
+
+#: plugins/admin/groups/class_groupMail.inc:350
+msgid "Remove the shared folder and all its contents from mail server."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:409
 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:395
+#: plugins/admin/groups/class_groupMail.inc:410
 msgid "to the list of forwarders."
 msgstr "zur Liste der Weiterleitungen hinzuzufügen."
 
-#: plugins/admin/groups/class_groupMail.inc:653
+#: plugins/admin/groups/class_groupMail.inc:669
 #, php-format
 msgid "Removing of groups/mail with dn '%s' failed."
 msgstr "Entfernen von Gruppe/Mail mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/groups/class_groupMail.inc:825
+#: plugins/admin/groups/class_groupMail.inc:851
 #, php-format
 msgid "Saving of groups/mail with dn '%s' failed."
 msgstr "Speichern von Gruppe/Mail mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:880
 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:887
+#: plugins/admin/groups/class_groupMail.inc:913
 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:891
+#: plugins/admin/groups/class_groupMail.inc:917
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
-#: plugins/admin/groups/class_groupMail.inc:1029
+#: plugins/admin/groups/class_groupMail.inc:1055
 #, fuzzy
 msgid "Group mail"
 msgstr "Gruppenname"
 
-#: plugins/admin/groups/class_groupMail.inc:1037
+#: plugins/admin/groups/class_groupMail.inc:1063
 msgid "Alternate addresses"
 msgstr "Weitere Adressen"
 
-#: plugins/admin/groups/class_groupMail.inc:1038
+#: plugins/admin/groups/class_groupMail.inc:1064
 msgid "Forwarding addresses"
 msgstr "Weiterleitungs-Adressen"
 
-#: plugins/admin/groups/class_groupMail.inc:1041
+#: plugins/admin/groups/class_groupMail.inc:1067
 #: plugins/admin/systems/printer.tpl:82
 #: plugins/admin/systems/class_printGeneric.inc:869
 msgid "Permissions"
@@ -6442,15 +6632,15 @@ msgstr "Zeige die Benutzer der Abteilung"
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: plugins/admin/groups/class_groupApplication.inc:395
+#: plugins/admin/groups/class_groupApplication.inc:407
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:415
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:416
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6458,11 +6648,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:406
+#: plugins/admin/groups/class_groupApplication.inc:418
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:407
+#: plugins/admin/groups/class_groupApplication.inc:419
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6470,80 +6660,91 @@ 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:420
+#: plugins/admin/groups/class_groupApplication.inc:426
+#: include/class_tabs.inc:303
+msgid "ACL"
+msgstr "Zugriffsregeln"
+
+#: plugins/admin/groups/class_groupApplication.inc:429
+msgid ""
+"You do not have permission to query application entries. All your changes "
+"will not be saved."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:442
 msgid "Invalid character in category name."
 msgstr "Die angegebene Kategorie enthält ungültige Zeichen."
 
-#: plugins/admin/groups/class_groupApplication.inc:428
+#: plugins/admin/groups/class_groupApplication.inc:450
 msgid "The specified category already exists."
 msgstr "Die angegebene Kategorie existiert bereits."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:556
 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:562
+#: plugins/admin/groups/class_groupApplication.inc:594
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
-#: plugins/admin/groups/class_groupApplication.inc:650
-#: plugins/admin/departments/class_divListDepartment.inc:137
+#: plugins/admin/groups/class_groupApplication.inc:680
+#: plugins/admin/departments/class_divListDepartment.inc:154
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/groups/class_groupApplication.inc:658
+#: plugins/admin/groups/class_groupApplication.inc:689
 msgid "application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupApplication.inc:694
-#: plugins/admin/groups/class_groupApplication.inc:736
+#: plugins/admin/groups/class_groupApplication.inc:705
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "Delete entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:696
-#: plugins/admin/groups/class_groupApplication.inc:731
+#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:741
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:699
-#: plugins/admin/groups/class_groupApplication.inc:734
+#: plugins/admin/groups/class_groupApplication.inc:710
+#: plugins/admin/groups/class_groupApplication.inc:744
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:729
+#: plugins/admin/groups/class_groupApplication.inc:739
 msgid "Insert seperator"
 msgstr "Feldtrenner einfügen"
 
-#: plugins/admin/groups/class_groupApplication.inc:769
+#: plugins/admin/groups/class_groupApplication.inc:784
 msgid "This application is no longer available."
 msgstr "Diese Applikation ist nicht mehr verfügbar."
 
-#: plugins/admin/groups/class_groupApplication.inc:772
+#: plugins/admin/groups/class_groupApplication.inc:787
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr "Diese Applikation ist im Release '%s' nicht verfügbar."
 
-#: plugins/admin/groups/class_groupApplication.inc:776
+#: plugins/admin/groups/class_groupApplication.inc:791
 msgid "Check parameter"
 msgstr "Überprüfe Parameter"
 
-#: plugins/admin/groups/class_groupApplication.inc:778
+#: plugins/admin/groups/class_groupApplication.inc:793
 msgid "This application has changed parameters."
 msgstr "Diese Applikation hat veränderte Parameter."
 
-#: plugins/admin/groups/class_groupApplication.inc:871
+#: plugins/admin/groups/class_groupApplication.inc:914
 #, php-format
 msgid "Removing of groups/applications with dn '%s' failed."
 msgstr "Entfernen von Gruppen/Anwendungen mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/groups/class_groupApplication.inc:916
+#: plugins/admin/groups/class_groupApplication.inc:967
 #, php-format
 msgid "Saving of groups/applications with dn '%s' failed."
 msgstr "Speichern von Gruppen/Anwendungen mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/groups/class_groupApplication.inc:960
+#: plugins/admin/groups/class_groupApplication.inc:1018
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -6552,14 +6753,22 @@ msgstr ""
 "Der Release-Name '%s' kann nicht aufgelöst werden. Nehme '%s' als neuen "
 "Release-Namen an."
 
-#: plugins/admin/groups/class_groupApplication.inc:1103
+#: plugins/admin/groups/class_groupApplication.inc:1023
+msgid ""
+"There are no releases available. You will not be able to select another "
+"release."
+msgstr ""
+"Es sind keine Releases verfügbar. Sie werden kein anderes Release auswählen "
+"können."
+
+#: plugins/admin/groups/class_groupApplication.inc:1164
 msgid "Group applications"
 msgstr "Anwendungen der Gruppe"
 
-#: plugins/admin/groups/class_groupApplication.inc:1110
+#: plugins/admin/groups/class_groupApplication.inc:1171
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:144
+#: plugins/admin/applications/class_divListApplication.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
 #: plugins/gofon/fonreports/contents.tpl:34
@@ -6567,19 +6776,19 @@ msgstr "Anwendungen der Gruppe"
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupApplication.inc:1111
+#: plugins/admin/groups/class_groupApplication.inc:1172
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:87
 #: plugins/admin/systems/servRepositorySetup.tpl:19
 #: plugins/admin/systems/class_servRepository.inc:238
-#: plugins/admin/fai/faiPackage.tpl:33
-#: plugins/admin/fai/class_faiPackage.inc:560
+#: plugins/admin/fai/faiPackage.tpl:37
+#: plugins/admin/fai/class_faiPackage.inc:542
 #: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Release"
 
-#: plugins/admin/groups/class_groupApplication.inc:1112
+#: plugins/admin/groups/class_groupApplication.inc:1173
 msgid "Application parameter"
 msgstr "Anwendungs-Parameter"
 
@@ -6609,7 +6818,7 @@ msgstr "Gruppenname / Abteilung"
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/admin/fai/faiScriptEntry.tpl:33
-#: plugins/gofon/conference/generic.tpl:4
+#: plugins/gofon/conference/generic.tpl:5
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -6662,58 +6871,57 @@ msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
 #: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:187
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:199
+#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/applications/class_divListApplication.inc:188
 #: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:199
+#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/applications/class_divListApplication.inc:188
 #: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: plugins/admin/groups/class_divListGroup.inc:201
+#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/applications/class_divListApplication.inc:195
 #: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "copy"
 msgstr "Kopieren"
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: plugins/admin/groups/class_divListGroup.inc:201
+#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/applications/class_divListApplication.inc:195
 #: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: plugins/admin/groups/class_divListGroup.inc:206
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/departments/class_divListDepartment.inc:133
 #: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
+#: plugins/gofon/conference/class_divListConferences.inc:159
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:138
 #: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
+#: plugins/gofon/conference/class_divListConferences.inc:169
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
@@ -6745,32 +6953,32 @@ msgstr ""
 "Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
 "Benutzer ohne dieses Passwort nicht anmelden kann."
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/users/class_userManagement.inc:273
+#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:272
 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:309
+#: plugins/admin/users/class_userManagement.inc:307
 #, 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:340
+#: plugins/admin/users/class_userManagement.inc:337
 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:448
+#: plugins/admin/users/class_userManagement.inc:444
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:282
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:463
 msgid "Please select a valid template."
 msgstr "Bitte wählen Sie eine gültige Vorlage."
 
-#: plugins/admin/users/class_userManagement.inc:560
+#: plugins/admin/users/class_userManagement.inc:556
 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."
@@ -6790,12 +6998,12 @@ msgstr ""
 "ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:798
-#: plugins/admin/fai/class_faiTemplate.inc:451
+#: plugins/admin/systems/class_systemManagement.inc:812
+#: plugins/admin/fai/class_faiTemplate.inc:486
 msgid "Template"
 msgstr "Vorlage"
 
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+#: plugins/admin/users/main.inc:42 plugins/admin/users/main.inc:48
 msgid "User administration"
 msgstr "Benutzerverwaltung"
 
@@ -6871,83 +7079,83 @@ msgstr "Auswählen, um die Benutzer zu sehen, die Proxy-Einstellungen besitzen"
 msgid "Show proxy users"
 msgstr "Zeige Proxy-Benutzer"
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:185
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/users/class_divListUsers.inc:186
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:192
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:194
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:196
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:198
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:200
 msgid "Edit netatalk properties"
 msgstr "Netatalk-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/users/class_divListUsers.inc:201
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:202
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:254
+#: plugins/admin/users/class_divListUsers.inc:260
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_divListUsers.inc:258
+#: plugins/admin/users/class_divListUsers.inc:264
 msgid "You are not allowed to change the password for this user."
 msgstr "Sie haben keine Berechtigung, das Passwort dieses Benutzers zu ändern."
 
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:278
 msgid "You are not allowed to remove this user."
 msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen."
 
-#: plugins/admin/users/class_divListUsers.inc:289
+#: plugins/admin/users/class_divListUsers.inc:297
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_divListUsers.inc:296
+#: plugins/admin/users/class_divListUsers.inc:304
 msgid "Offline"
 msgstr "inaktiv"
 
@@ -6959,9 +7167,9 @@ msgid "Application name"
 msgstr "Name der Anwendung"
 
 #: plugins/admin/applications/generic.tpl:15
-#: plugins/gofon/macro/generic.tpl:10
-#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:14
+#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Display name"
 msgstr "Angezeigter Name"
 
@@ -6977,7 +7185,7 @@ msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 #: plugins/admin/systems/goMailServer.tpl:215
 #: plugins/admin/systems/goImapServer.tpl:110
 #: plugins/admin/ogroups/termgroup.tpl:101
-#: plugins/admin/fai/faiTemplateEntry.tpl:89
+#: plugins/admin/fai/faiTemplateEntry.tpl:105
 msgid "Execute"
 msgstr "Ausführen"
 
@@ -7034,15 +7242,15 @@ msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 #: plugins/admin/applications/generic.tpl:135
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
-#: plugins/admin/fai/faiTemplateEntry.tpl:40
+#: plugins/admin/fai/faiTemplateEntry.tpl:49
 msgid "Upload"
 msgstr "Hochladen"
 
 #: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:288
-#: plugins/admin/fai/class_faiTemplate.inc:252
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:271
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:273
+#: plugins/admin/fai/class_faiHook.inc:308
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Herunterladen"
@@ -7069,12 +7277,12 @@ msgstr ""
 "Schaltfläche unten hinzufügen."
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/admin/fai/class_faiVariable.inc:384
+#: plugins/admin/fai/class_faiVariable.inc:412
 msgid "Variable"
 msgstr "Variable"
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/gofon/macro/parameter.tpl:9
+#: plugins/gofon/macro/parameter.tpl:10
 msgid "Default value"
 msgstr "Standardwert"
 
@@ -7225,13 +7433,13 @@ msgstr ""
 "oder zu entfernen. Bei einer großen Anzahl von Anwendungen bietet sich die "
 "Verwendung der Bereichsauswahl an."
 
-#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/applications/class_divListApplication.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:122
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_divListApplication.inc:113
+#: plugins/admin/applications/class_divListApplication.inc:129
 msgid "Create new application"
 msgstr "Neue Anwendungen erstellen"
 
@@ -7256,7 +7464,7 @@ msgid "Name of subtree to create"
 msgstr "Name des zu erzeugenden Teilbaums"
 
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:84
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
@@ -7270,7 +7478,7 @@ msgid "Category for this subtree"
 msgstr "Kategorie dieses Teilbaums"
 
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:168
 msgid "Choose subtree to place department in"
 msgstr "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
 
@@ -7417,7 +7625,7 @@ msgstr "Verschiebe '%s' nach '%s'"
 #: include/class_ldap.inc:458 include/class_acl.inc:523
 #: include/class_acl.inc:530 include/class_acl.inc:537
 #: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:54
+#: ihtml/themes/default/snapshotdialog.tpl:53
 msgid "Object"
 msgstr "Objekt"
 
@@ -7449,14 +7657,14 @@ msgid "Department name"
 msgstr "Name der Abteilung"
 
 #: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Sie sind dabei, einen gesamten LDAP-Teilbaum unterhalb von '%s' zu löschen."
 
 #: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
@@ -7483,12 +7691,12 @@ msgstr ""
 msgid "Regular expression for matching department names"
 msgstr "Regulärer Ausdruck zum Erkennen von Abteilungs-Namen"
 
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/fai/class_divListFai.inc:124
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/fai/class_divListFai.inc:139
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
-#: plugins/admin/departments/class_divListDepartment.inc:84
+#: plugins/admin/departments/class_divListDepartment.inc:101
 msgid "Create new department"
 msgstr "Neue Abteilung erstellen"
 
@@ -7527,7 +7735,7 @@ msgstr "Zone"
 #: plugins/admin/systems/network.tpl:77
 #: plugins/admin/systems/class_servDNS.inc:168
 #: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:543
+#: plugins/admin/systems/class_termDNS.inc:542
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7545,7 +7753,7 @@ msgstr "vorhanden"
 #: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalStartup.inc:161
 #: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:470
+#: plugins/admin/systems/class_workstationStartup.inc:471
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
@@ -7749,7 +7957,7 @@ msgstr "Terminal-Name"
 
 #: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
 #: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:505
+#: plugins/admin/systems/class_terminalGeneric.inc:508
 #: plugins/admin/systems/phonesettings.tpl:25
 #: plugins/admin/ogroups/termgroup.tpl:47
 #: plugins/admin/ogroups/class_termgroup.inc:389
@@ -7777,7 +7985,7 @@ msgid "Choose server to use for logging"
 msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
 #: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:506
+#: plugins/admin/systems/class_terminalGeneric.inc:509
 msgid "Root server"
 msgstr "Root-Server"
 
@@ -7786,7 +7994,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
 #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:507
+#: plugins/admin/systems/class_terminalGeneric.inc:510
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
@@ -7854,10 +8062,10 @@ msgstr "unbekannt"
 #: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/admin/systems/class_terminalGeneric.inc:298
 #: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:783
+#: plugins/admin/systems/class_workstationStartup.inc:268
+#: plugins/admin/systems/class_workstationStartup.inc:285
+#: plugins/admin/systems/class_workstationStartup.inc:289
+#: plugins/admin/systems/class_workstationStartup.inc:790
 #: plugins/admin/systems/class_workstationService.inc:201
 #: plugins/admin/systems/class_workstationService.inc:204
 #: plugins/admin/systems/class_workstationService.inc:207
@@ -8058,7 +8266,7 @@ msgid "Telephone hardware"
 msgstr "Telefon-Hardware"
 
 #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:310
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8077,28 +8285,28 @@ msgid "Terminal startup"
 msgstr "Terminal-Start"
 
 #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1109
+#: plugins/admin/systems/class_workstationStartup.inc:1118
 msgid "Ldap server"
 msgstr "LDAP-Server"
 
 #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1113
+#: plugins/admin/systems/class_workstationStartup.inc:1122
 msgid "Kernel modules"
 msgstr "Kernel-Module"
 
 #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1119
 #: plugins/admin/systems/workstationStartup.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:8
 msgid "Boot kernel"
 msgstr "Boot-Kernel"
 
 #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1111
+#: plugins/admin/systems/class_workstationStartup.inc:1120
 msgid "Kernel parameter"
 msgstr "Kernel-Parameter"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:185
 msgid "Server name"
 msgstr "Server-Name"
 
@@ -8320,32 +8528,32 @@ msgstr ""
 "Es muss mindestens ein NTP-Server ausgewählt sein, wenn der Übernahme-Modus "
 "nicht aktiv ist."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:485
+#: plugins/admin/systems/class_terminalGeneric.inc:488
 #, php-format
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr "Speichern von Objekt Terminal/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:496
-#: plugins/admin/systems/class_terminalGeneric.inc:502
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#: plugins/admin/systems/class_terminalGeneric.inc:505
+#: plugins/admin/systems/class_systemManagement.inc:813
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:385
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:497
+#: plugins/admin/systems/class_terminalGeneric.inc:500
 msgid "Terminal generic"
 msgstr "Terminal (Allgemein)"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:508
+#: plugins/admin/systems/class_terminalGeneric.inc:511
 msgid "Syslog server enabled"
 msgstr "Protokoll-Server aktiviert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:509
+#: plugins/admin/systems/class_terminalGeneric.inc:512
 msgid "Ntp server settings"
 msgstr "NTP-Dienst-Einstellungen"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:515
 #: plugins/admin/systems/class_servGeneric.inc:347
 #: plugins/admin/systems/class_workstationGeneric.inc:519
 #: plugins/admin/ogroups/class_termgroup.inc:391
@@ -8496,7 +8704,7 @@ msgid "Workstation generic"
 msgstr "Arbeitsstation (Allgemein)"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_systemManagement.inc:814
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:384
 #: plugins/generic/references/class_reference.inc:48
@@ -8512,97 +8720,97 @@ msgstr "NTP-Dienst"
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:208
+#: plugins/admin/systems/class_systemManagement.inc:222
 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:233
+#: plugins/admin/systems/class_systemManagement.inc:247
 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:250
+#: plugins/admin/systems/class_systemManagement.inc:264
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 "Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:304
+#: plugins/admin/systems/class_systemManagement.inc:318
 #, 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."
 
-#: plugins/admin/systems/class_systemManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:371
+#: plugins/admin/systems/class_systemManagement.inc:324
+#: plugins/admin/systems/class_systemManagement.inc:385
 #: plugins/admin/fai/class_faiManagement.inc:168
 #: plugins/admin/fai/class_faiManagement.inc:221
 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:638
+#: plugins/admin/systems/class_systemManagement.inc:652
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:640
+#: plugins/admin/systems/class_systemManagement.inc:654
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:656
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:675
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:677
+#: plugins/admin/systems/class_systemManagement.inc:691
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_systemManagement.inc:811
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_systemManagement.inc:815
 msgid "Workstation is installing"
 msgstr "Arbeitsstation installiert gerade"
 
-#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_systemManagement.inc:816
 msgid "Workstation is waiting for action"
 msgstr "Arbeitsstation wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_systemManagement.inc:817
 msgid "Workstation installation failed"
 msgstr "Installation der Arbeitsstation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:806
+#: plugins/admin/systems/class_systemManagement.inc:820
 msgid "Server is installing"
 msgstr "Server wird installiert"
 
-#: plugins/admin/systems/class_systemManagement.inc:807
+#: plugins/admin/systems/class_systemManagement.inc:821
 msgid "Server is waiting for action"
 msgstr "Server wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:808
+#: plugins/admin/systems/class_systemManagement.inc:822
 msgid "Server installation failed"
 msgstr "Server-Installation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:809
+#: plugins/admin/systems/class_systemManagement.inc:823
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:810
+#: plugins/admin/systems/class_systemManagement.inc:824
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:811
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_systemManagement.inc:825
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:826
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
@@ -8749,7 +8957,7 @@ msgid "Reverse zone"
 msgstr "Reverse Zone"
 
 #: plugins/admin/systems/class_servDNS.inc:169
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/fai/faiTemplateEntry.tpl:102
 msgid "Class"
 msgstr "Klasse"
 
@@ -8784,7 +8992,7 @@ msgstr ""
 "Setzen von Status-Flag für System Server/DNS mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_termDNS.inc:541
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zonenname"
@@ -8834,13 +9042,11 @@ msgstr "Das Attribut Benutzer ist leer oder enthält ungültige Zeichen."
 
 #: plugins/admin/systems/class_goFaxServer.inc:67
 #: plugins/admin/systems/class_goFonServer.inc:70
-#, php-format
 msgid "The attribute password is empty or contains invalid characters."
 msgstr "Das Attribut Passwort ist leer oder enthält ungültige Zeichen."
 
 #: plugins/admin/systems/class_goFaxServer.inc:84
 #: plugins/admin/systems/class_goFaxServer.inc:85
-#, fuzzy
 msgid "Fax database"
 msgstr "Fax-Datenbank"
 
@@ -9104,8 +9310,8 @@ msgstr "Speichern von System Drucker/Allgemein mit dn '%s' fehlgeschlagen."
 #: plugins/admin/systems/class_printGeneric.inc:837
 #: plugins/admin/systems/class_printGeneric.inc:839
 #: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/admin/fai/faiTemplateEntry.tpl:85
+#: plugins/admin/fai/faiTemplateEntry.tpl:127
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Gruppe"
@@ -9338,12 +9544,12 @@ msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "yes"
 msgstr "ja"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 msgid "no"
 msgstr "nein"
 
@@ -9489,7 +9695,7 @@ msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:401
+#: plugins/admin/systems/class_workstationStartup.inc:402
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9498,12 +9704,12 @@ msgstr ""
 "momentanen Einstellungen für Server und Release nicht aufgelöst werden "
 "können."
 
-#: plugins/admin/systems/class_workstationStartup.inc:446
+#: plugins/admin/systems/class_workstationStartup.inc:447
 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."
 
-#: plugins/admin/systems/class_workstationStartup.inc:508
+#: plugins/admin/systems/class_workstationStartup.inc:509
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9511,7 +9717,11 @@ msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
-#: plugins/admin/systems/class_workstationStartup.inc:856
+#: plugins/admin/systems/class_workstationStartup.inc:721
+msgid "Not available in current setup"
+msgstr "Nicht verfügbar in momentaner Konfiguration"
+
+#: plugins/admin/systems/class_workstationStartup.inc:863
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9520,32 +9730,30 @@ msgstr ""
 "Kann eine oder mehrere der angegebenen FAI-Klasse(n) [%s] für FAI-Server '%"
 "s' nicht auflösen. Der Server wurde auf 'auto' zurückgesetzt."
 
-#: plugins/admin/systems/class_workstationStartup.inc:870
+#: plugins/admin/systems/class_workstationStartup.inc:879
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"configurations, possibly some classes where deleted or renamed. Server was "
+"reset to 'auto'."
 msgstr ""
 "Kann die angegebenen FAI-Klasse(n) [%s] nicht auflösen, bitte überprüfen Sie "
 "Ihre FAI-Konfigurationen (wahrscheinlich wurden einige Klassen entfernt oder "
-"umbenannt). Alle (!) Klassen wurden von diesem Konto entfernt. Drücken Sie "
-"'Abbrechen', wenn Sie die diese Änderung nicht speichern möchten."
+"umbenannt). Der Server wurde auf 'auto' zurückgesetzt."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1031
+#: plugins/admin/systems/class_workstationStartup.inc:1040
 #, php-format
 msgid "Saving of system workstation/startup with dn '%s' failed."
 msgstr ""
 "Speichern von System Arbeitsstation/Systemstart mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1081
+#: plugins/admin/systems/class_workstationStartup.inc:1090
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "Kann das als REPOSITORY_HOOK angegebene Kommando '%s' nicht ausführen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1083
+#: plugins/admin/systems/class_workstationStartup.inc:1092
 #: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
@@ -9555,25 +9763,25 @@ msgstr ""
 "Das als REPOSITORY_HOOK '%s' angegebene Kommando lieferte eine leere "
 "Zeichenkette."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1101
+#: plugins/admin/systems/class_workstationStartup.inc:1110
 msgid "System startup"
 msgstr "Systemstart"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1116
-#: plugins/admin/fai/class_faiProfile.inc:447
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/fai/class_faiProfile.inc:453
+#: plugins/admin/fai/faiProfile.tpl:36
 msgid "FAI classes"
 msgstr "FAI-Klassen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1117
+#: plugins/admin/systems/class_workstationStartup.inc:1126
 msgid "Debian mirror"
 msgstr "Debian Spiegelserver"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1127
 msgid "Debian release"
 msgstr "Debian-Release"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1129
 msgid "FAI status flag"
 msgstr "FAI-Status-Flag"
 
@@ -9740,18 +9948,20 @@ msgstr ""
 "Die hochgeladene PPD-Datei ist leer, kann daher keine neue PPD-Datei anlegen."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/fai/class_faiPackage.inc:558
+#: plugins/admin/fai/faiPackage.tpl:45
+#: plugins/admin/fai/class_faiPackage.inc:539
 msgid "Section"
 msgstr "Section"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:462
 #: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
 msgid "True"
 msgstr "wahr"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:463
 #: plugins/admin/systems/class_printerPPDDialog.inc:466
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
 msgid "False"
 msgstr "falsch"
 
@@ -9795,7 +10005,7 @@ msgstr "Wählen Sie die hinzuzufügenden Objekte"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:45
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
@@ -9804,7 +10014,7 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:52
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/ogroups/ogroup_objects.tpl:46
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
@@ -10075,7 +10285,7 @@ msgstr "Wählen Sie den Scanner-Treiber, der benutzt werden soll"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/systems/class_servRepository.inc:349
-#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/fai/faiPackage.tpl:33
 msgid "Repository"
 msgstr "Repository"
 
@@ -10410,7 +10620,7 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
 msgid "File"
 msgstr "Datei"
 
@@ -10567,7 +10777,7 @@ msgid "Add/Edit network interface"
 msgstr "Netzwerk-Interface hinzufügen/bearbeiten"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:533
+#: plugins/admin/systems/class_termDNS.inc:532
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -10649,7 +10859,7 @@ msgid "New processor"
 msgstr "Neuer Prozessor"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "P"
 msgstr "P"
 
@@ -10757,8 +10967,8 @@ msgstr "Website"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
 #: plugins/admin/ogroups/class_mailogroup.inc:146
 #: plugins/admin/ogroups/class_phonequeue.inc:701
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/conference/generic.tpl:100 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Phone number"
 msgstr "Telefonnummer"
 
@@ -10965,11 +11175,11 @@ msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
 msgid "Wrong IP format in field IP-address."
 msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 
-#: plugins/admin/systems/class_termDNS.inc:325
+#: plugins/admin/systems/class_termDNS.inc:324
 msgid "The required field 'MAC-address' is not set."
 msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_termDNS.inc:332
+#: plugins/admin/systems/class_termDNS.inc:331
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -10977,18 +11187,18 @@ msgstr ""
 "Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 2-Byte Segmente "
 "angegeben werden (getrennt durch ':')."
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_termDNS.inc:351
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr "Es wurde ein doppelter Wert für Eintrag-Typ '%s' gefunden."
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_termDNS.inc:359
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 "Es wurde mehr als ein Eintrag für den eindeutigen Eintrags-Typ '%s' gefunden."
 
-#: plugins/admin/systems/class_termDNS.inc:371
+#: plugins/admin/systems/class_termDNS.inc:370
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -10997,30 +11207,30 @@ msgstr ""
 "Das Gerät mit der-IP-Adresse '%s' erhält automatisch einen 'A'-Eintrag. "
 "Bitte entfernen Sie den Eintrag."
 
-#: plugins/admin/systems/class_termDNS.inc:378
+#: plugins/admin/systems/class_termDNS.inc:377
 #: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
 
-#: plugins/admin/systems/class_termDNS.inc:461
+#: plugins/admin/systems/class_termDNS.inc:460
 #, php-format
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Speichern von Terminal/DNS-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:522
 msgid "DNS"
 msgstr "DNS"
 
-#: plugins/admin/systems/class_termDNS.inc:524
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "DNS settings"
 msgstr "DNS-Einstellungen"
 
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:531
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_termDNS.inc:540
 msgid "DNS records"
 msgstr "DNS-Einträge"
 
@@ -11125,7 +11335,7 @@ msgstr "Objektgruppe wählen"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
 msgid "Down"
 msgstr "Ab"
 
@@ -11379,88 +11589,96 @@ msgstr "Zeige Netzwerk-Geräte"
 msgid "Display systems of user"
 msgstr "Zeige Systeme des Benutzers"
 
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:141
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:112
-#: plugins/admin/systems/class_divListSystem.inc:113
+#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/class_divListSystem.inc:115
+#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_divListSystem.inc:116
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/systems/class_divListSystem.inc:146
+#: plugins/admin/systems/class_divListSystem.inc:147
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:165
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:166
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:167
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:168
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:169
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:170
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:171
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:172
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:173
 msgid "Fax Server"
 msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:174
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/acl/class_divListACL.inc:123
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: plugins/admin/systems/class_divListSystem.inc:192
 #: plugins/admin/acl/class_divListACL.inc:126
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 msgid "Set root       password"
 msgstr "root-Passwort setzen"
 
+#: plugins/admin/systems/class_divListSystem.inc:229
+msgid "Create CD"
+msgstr "Erstelle CD"
+
+#: plugins/admin/systems/class_divListSystem.inc:230
+msgid "Create FAI CD"
+msgstr "Erstelle FAI-CD"
+
 #: plugins/admin/systems/ServiceAddDialog.tpl:3
 msgid "Adding a new service to the current server"
 msgstr "Hinzufügen eines neues Dienstes zum gewählten Server"
@@ -11597,9 +11815,8 @@ msgstr "Die angegebene Methode '%s' kann nicht für Dienste ausgeführt werden."
 
 #: plugins/admin/systems/class_goNtpServer.inc:29
 #: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
 msgid "Time service (NTP)"
-msgstr "Zeit-Dienst"
+msgstr "Zeit-Dienst (NTP)"
 
 #: plugins/admin/systems/class_goNtpServer.inc:93
 #, php-format
@@ -11611,9 +11828,8 @@ msgid "Time service"
 msgstr "Zeit-Dienst"
 
 #: plugins/admin/systems/class_goNtpServer.inc:107
-#, fuzzy
 msgid "Time service - NTP"
-msgstr "Zeit-Dienst"
+msgstr "Zeit-Dienst - NTP"
 
 #: plugins/admin/systems/class_goNtpServer.inc:115
 msgid "Ntp source"
@@ -11805,18 +12021,15 @@ msgid "VoIP service - Asterisk management"
 msgstr "VoIP-Dienst - Asterisk Verwaltung"
 
 #: plugins/admin/systems/class_goFonServer.inc:67
-#, php-format
 msgid "The attribute DB user is empty or contains invalid characters."
 msgstr "Das Attribut DB ist leer oder enthält ungültige Zeichen."
 
 #: plugins/admin/systems/class_goFonServer.inc:73
-#, php-format
 msgid ""
 "The attribute local dial prefix is empty or contains invalid characters."
 msgstr "Das Attribut Ortsvorwahl ist leer oder enthält ungültige Zeichen."
 
 #: plugins/admin/systems/class_goFonServer.inc:76
-#, php-format
 msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Das Attribut Landesvorwahl ist leer oder enthält ungültige Zeichen."
@@ -11987,6 +12200,54 @@ msgstr "IMAP/POP3"
 msgid "Admin password"
 msgstr "Administrator-Passwort:"
 
+#: plugins/admin/systems/class_goShareServer.inc:32
+msgid "File service"
+msgstr "Datei-Dienst"
+
+#: plugins/admin/systems/class_goShareServer.inc:153
+#: plugins/admin/systems/class_goShareServer.inc:343
+msgid "File service (Shares)"
+msgstr "Datei-Dienst (Freigaben)"
+
+#: plugins/admin/systems/class_goShareServer.inc:187
+#, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr "Speichern von System Server/Freigabe mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goShareServer.inc:238
+#, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+"Erstellen von System Server/Freigabe (Mount-Container) mit dn '%s' "
+"fehlgeschlagen."
+
+#: plugins/admin/systems/class_goShareServer.inc:252
+#, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+"Entfernen von System Server/Freigaben (Mount-Container) mit dn '%s' "
+"fehlgeschlagen."
+
+#: plugins/admin/systems/class_goShareServer.inc:263
+#, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+"Speichern von System Server/Freigaben (Mount-Container) mit dn '%s' "
+"fehlgeschlagen."
+
+#: plugins/admin/systems/class_goShareServer.inc:344
+msgid "File service - Shares"
+msgstr "Datei-Dienst - Freigaben"
+
+#: plugins/admin/systems/class_goShareServer.inc:353
+#, fuzzy
+msgid "Apple mounts"
+msgstr "Apple Talk"
+
+#: plugins/admin/systems/class_goShareServer.inc:356
+msgid "Charset"
+msgstr "Zeichensatz"
+
 #: plugins/admin/systems/goLogDBServer.tpl:1
 msgid "Logging database information"
 msgstr "Informationen der Protokoll-Datenbank"
@@ -12194,9 +12455,9 @@ msgid "Empty service"
 msgstr "Leerer Dienst"
 
 #: plugins/admin/systems/class_goService.inc:92
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of server services/"
-msgstr "GOfon-Dienst"
+msgstr "Entfernen von Server Dienste/"
 
 #: plugins/admin/systems/class_goService.inc:92
 #: plugins/admin/systems/class_goService.inc:116
@@ -12213,15 +12474,14 @@ msgid ") with dn '%s' failed."
 msgstr ") mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goService.inc:116
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of server services/"
-msgstr "Fax-Dienst"
+msgstr "Speichern von Server Dienste/"
 
 #: plugins/admin/systems/class_goService.inc:147
-#, fuzzy, php-format
+#, php-format
 msgid "Set status flag for server services/"
-msgstr ""
-"Setzen von Status-Flag für Server Dienste/GLPI mit dn '%s' fehlgeschlagen."
+msgstr "Setzen von Status-Flag für Server Dienste/"
 
 #: plugins/admin/systems/class_goService.inc:204
 #, php-format
@@ -12231,54 +12491,6 @@ msgstr ""
 "Das als ACTION_HOOK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: plugins/admin/systems/class_goShareServer.inc:32
-msgid "File service"
-msgstr "Datei-Dienst"
-
-#: plugins/admin/systems/class_goShareServer.inc:153
-#: plugins/admin/systems/class_goShareServer.inc:343
-msgid "File service (Shares)"
-msgstr "Datei-Dienst (Freigaben)"
-
-#: plugins/admin/systems/class_goShareServer.inc:187
-#, php-format
-msgid "Saving of system server/shares with dn '%s' failed."
-msgstr "Speichern von System Server/Freigabe mit dn '%s' fehlgeschlagen."
-
-#: plugins/admin/systems/class_goShareServer.inc:238
-#, php-format
-msgid "Creating system server/shares (mount container) with dn '%s' failed."
-msgstr ""
-"Erstellen von System Server/Freigabe (Mount-Container) mit dn '%s' "
-"fehlgeschlagen."
-
-#: plugins/admin/systems/class_goShareServer.inc:252
-#, php-format
-msgid "Removing system server/shares (mount container) with dn '%s' failed."
-msgstr ""
-"Entfernen von System Server/Freigaben (Mount-Container) mit dn '%s' "
-"fehlgeschlagen."
-
-#: plugins/admin/systems/class_goShareServer.inc:263
-#, php-format
-msgid "Saving system server/shares (mount container) with dn '%s' failed."
-msgstr ""
-"Speichern von System Server/Freigaben (Mount-Container) mit dn '%s' "
-"fehlgeschlagen."
-
-#: plugins/admin/systems/class_goShareServer.inc:344
-msgid "File service - Shares"
-msgstr "Datei-Dienst - Freigaben"
-
-#: plugins/admin/systems/class_goShareServer.inc:353
-#, fuzzy
-msgid "Apple mounts"
-msgstr "Apple Talk"
-
-#: plugins/admin/systems/class_goShareServer.inc:356
-msgid "Charset"
-msgstr "Zeichensatz"
-
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -12382,12 +12594,12 @@ 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
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects of department"
 msgstr "Zeige die Objekte der Abteilung"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:696
+#: plugins/admin/ogroups/class_ogroup.inc:711
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Objektgruppen"
@@ -12402,82 +12614,82 @@ msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 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_ogroup.inc:138
+#: plugins/admin/ogroups/class_ogroup.inc:146
 msgid "This 'dn' is no object group."
 msgstr "Diese 'dn' ist keine Objektgruppenerweiterungen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
+#: plugins/admin/ogroups/class_ogroup.inc:294
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:291
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:293
+#: plugins/admin/ogroups/class_ogroup.inc:301
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:302
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:309
 msgid "and"
 msgstr "und"
 
-#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:462
 msgid "Non existing dn:"
 msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:589
+#: plugins/admin/ogroups/class_ogroup.inc:604
 msgid "There is already an object with this cn."
 msgstr "Diese cn ist bereits vergeben."
 
-#: plugins/admin/ogroups/class_ogroup.inc:603
+#: plugins/admin/ogroups/class_ogroup.inc:618
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:652
+#: plugins/admin/ogroups/class_ogroup.inc:667
 #, php-format
 msgid "Saving of object group/generic with dn '%s' failed."
 msgstr "Speichern von Objektgruppe/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
+#: plugins/admin/ogroups/class_ogroup.inc:680
 #, php-format
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Entfernen von Objektgruppe/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:691
+#: plugins/admin/ogroups/class_ogroup.inc:706
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_ogroup.inc:717
 msgid "Member"
 msgstr "Mitglied"
 
@@ -12727,7 +12939,7 @@ msgstr ""
 "nicht gespeichert werden."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12741,9 +12953,9 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:95
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-#: plugins/gofon/macro/class_gofonMacro.inc:247
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:245
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
@@ -12759,8 +12971,8 @@ msgstr "Kann Datenbank '%s' auf Server '%s' nicht löschen."
 #: plugins/admin/ogroups/class_phonequeue.inc:537
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
@@ -12775,8 +12987,8 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:88
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1065
-#: plugins/gofon/macro/class_gofonMacro.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:234
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12999,19 +13211,19 @@ msgstr "Zeige Abteilungen"
 msgid "ACL management"
 msgstr "ACL-Verwaltung"
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiVariable.tpl:36
+#: plugins/admin/fai/faiPartitionTable.tpl:36
+#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:33
 #: plugins/admin/fai/faiHook.tpl:38
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
 msgid "Objects"
 msgstr "Objekte"
 
-#: plugins/admin/fai/faiVariable.tpl:34
+#: plugins/admin/fai/faiVariable.tpl:38
 msgid "List of assigned variables"
 msgstr "Liste benutzter Variablen"
 
-#: plugins/admin/fai/faiVariable.tpl:40
+#: plugins/admin/fai/faiVariable.tpl:44
 msgid "Choose a variable to delete or edit"
 msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 
@@ -13019,47 +13231,32 @@ msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:411
+#: plugins/admin/fai/class_faiScript.inc:422
 #, php-format
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Erzeugen von FAI/Skript mit dn '%s' fehlgeschlagen"
 
-#: plugins/admin/fai/class_faiScript.inc:508
-#: plugins/admin/fai/class_faiHookEntry.inc:189
+#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiHookEntry.inc:191
 msgid "FAI script"
 msgstr "FAI-Skript"
 
-#: plugins/admin/fai/class_faiScript.inc:515
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 msgid "Readonly"
 msgstr "Nur Lesen"
 
-#: plugins/admin/fai/class_faiTemplate.inc:366
+#: plugins/admin/fai/class_faiTemplate.inc:401
 #, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Speichern von FAI/Vorlage mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiTemplate.inc:452
+#: plugins/admin/fai/class_faiTemplate.inc:487
 msgid "FAI template"
 msgstr "FAI-Vorlage"
 
-#: plugins/admin/fai/class_faiTemplate.inc:461
-msgid "Template file"
-msgstr "Vorlagen-Datei"
-
-#: plugins/admin/fai/class_faiTemplate.inc:462
-msgid "Template path"
-msgstr "Vorlagen-Pfad"
-
-#: plugins/admin/fai/class_faiTemplate.inc:463
-msgid "File owner"
-msgstr "Datei-Besitzer"
-
-#: plugins/admin/fai/class_faiTemplate.inc:464
-msgid "File permissions"
-msgstr "Datei-Berechtigungen"
-
 #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:851
+#: plugins/admin/fai/class_faiManagement.inc:853
 msgid "FAI"
 msgstr "FAI"
 
@@ -13105,36 +13302,40 @@ msgid "You are not allowed to create a new branch."
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
 
 #: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:520
+#: plugins/admin/fai/class_faiManagement.inc:522
 #, fuzzy, php-format
 msgid "You are not allowed to create a new '%s' object."
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/fai/class_faiManagement.inc:845
+#: plugins/admin/fai/class_faiManagement.inc:847
 msgid "FAI releases"
 msgstr "FAI Releases"
 
-#: plugins/admin/fai/class_faiManagement.inc:846
+#: plugins/admin/fai/class_faiManagement.inc:848
 msgid "FAI release management"
 msgstr "FAI Release-Verwaltung"
 
-#: plugins/admin/fai/faiPackage.tpl:49
+#: plugins/admin/fai/faiPackage.tpl:53
 msgid "Install method"
 msgstr "Installations-Methode"
 
-#: plugins/admin/fai/faiPackage.tpl:65
+#: plugins/admin/fai/faiPackage.tpl:57
+msgid "Please select the installation method"
+msgstr "Bitte wählen Sie die Installations-Methode"
+
+#: plugins/admin/fai/faiPackage.tpl:71
 msgid "Used packages"
 msgstr "Verwendete Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:73
 msgid "Choosen packages"
 msgstr "Gewählte Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/faiPackage.tpl:80
 msgid "Toggle remove flag"
 msgstr "Entfernen-Flag umschalten"
 
@@ -13146,11 +13347,11 @@ msgstr ""
 "Dies umfasst 'alle' Objekt-Informationen Bitte prüfen Sie genau, da es keine "
 "Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
+#: plugins/admin/fai/faiPartitionTable.tpl:38
 msgid "Discs"
 msgstr "Festplatten"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
+#: plugins/admin/fai/faiPartitionTable.tpl:44
 msgid "Choose a disk to delete or edit"
 msgstr "Wählen Sie eine Festplatte zum Entfernen oder Bearbeiten"
 
@@ -13201,9 +13402,9 @@ msgid "Selected file is empty."
 msgstr "Die angebene Datei ist leer."
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:136
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:148
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiVariableEntry.inc:107
+#: plugins/admin/fai/class_faiHookEntry.inc:150
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a name."
 msgstr "Bitte geben Sie eine Namen ein."
 
@@ -13222,7 +13423,6 @@ msgid "FAI script entry"
 msgstr "FAI Skript-Eintrag"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:182
-#, fuzzy
 msgid "Script Priority"
 msgstr "Skript-Priorität"
 
@@ -13231,7 +13431,7 @@ msgstr "Skript-Priorität"
 msgid "Script attributes"
 msgstr "Skript-Attribute"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:33
+#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:37
 msgid "Choose a priority"
 msgstr "Wählen Sie eine Priorität"
 
@@ -13240,178 +13440,184 @@ msgstr "Wählen Sie eine Priorität"
 msgid "Import script"
 msgstr "Skript importieren"
 
-#: plugins/admin/fai/class_faiPackage.inc:399
+#: plugins/admin/fai/class_faiPackage.inc:380
 msgid "Please select a least one Package."
 msgstr "Bitte wählen Sie mindestens ein Paket."
 
-#: plugins/admin/fai/class_faiPackage.inc:403
+#: plugins/admin/fai/class_faiPackage.inc:384
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
 
-#: plugins/admin/fai/class_faiPackage.inc:424
+#: plugins/admin/fai/class_faiPackage.inc:405
 msgid "package is configured"
 msgstr "Paket ist konfiguriert"
 
-#: plugins/admin/fai/class_faiPackage.inc:430
+#: plugins/admin/fai/class_faiPackage.inc:411
 msgid "Package marked for removal"
 msgstr "Paket zum Entfernen vorgemerkt"
 
-#: plugins/admin/fai/class_faiPackage.inc:457
+#: plugins/admin/fai/class_faiPackage.inc:438
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Paket '%s' existiert nicht."
 
-#: plugins/admin/fai/class_faiPackage.inc:501
+#: plugins/admin/fai/class_faiPackage.inc:482
 #, php-format
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Speichern von FAI/Paketliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiPackage.inc:547
+#: plugins/admin/fai/class_faiPackage.inc:528
 #: plugins/admin/fai/faiPackageConfiguration.tpl:1
 msgid "Package"
 msgstr "Paket"
 
-#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiPackage.inc:529
 msgid "FAI Package list"
 msgstr "FAI-Paketliste"
 
-#: plugins/admin/fai/class_faiPackage.inc:559
+#: plugins/admin/fai/class_faiPackage.inc:540
 msgid "Install Method"
 msgstr "Installations-Methode"
 
-#: plugins/admin/fai/class_faiProfile.inc:285
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
+#: plugins/admin/fai/class_faiPackage.inc:541
+msgid "Package configuration"
+msgstr "Paket-Konfiguration"
+
+#: plugins/admin/fai/class_faiProfile.inc:290
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 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:288
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfileEntry.inc:135
 msgid "Hook bundle"
 msgstr "Hook-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfileEntry.inc:136
 msgid "Template bundle"
 msgstr "Vorlagen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:290
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:137
 msgid "Script bundle"
 msgstr "Skript-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:291
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfileEntry.inc:138
 msgid "Variable bundle"
 msgstr "Variablen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:297
 msgid "Packages bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiPartitionTable.inc:490
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiProfile.inc:298
+#: plugins/admin/fai/class_faiPartitionTable.inc:520
+#: plugins/admin/fai/class_faiProfileEntry.inc:140
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:301
 msgid "Remove class from profile"
 msgstr "Entferne Klasse von Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:386
+#: plugins/admin/fai/class_faiProfile.inc:392
 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:390
+#: plugins/admin/fai/class_faiProfile.inc:396
 msgid "Please enter a valid name."
 msgstr "Bitte geben Sie einen gültigen Namen ein."
 
-#: plugins/admin/fai/class_faiProfile.inc:402
+#: plugins/admin/fai/class_faiProfile.inc:408
 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."
 
-#: plugins/admin/fai/class_faiProfile.inc:425
-#: plugins/admin/fai/class_faiProfile.inc:429
+#: plugins/admin/fai/class_faiProfile.inc:431
+#: plugins/admin/fai/class_faiProfile.inc:435
 #, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Speichern von FAI/Profil mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiProfile.inc:437
+#: plugins/admin/fai/class_faiProfile.inc:443
 msgid "Profile"
 msgstr "Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:438
+#: plugins/admin/fai/class_faiProfile.inc:444
 msgid "FAI profile"
 msgstr "FAI-Profil"
 
-#: plugins/admin/fai/class_faiHook.inc:402
+#: plugins/admin/fai/class_faiHook.inc:436
 #, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Speichern von FAI/Hook mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiHook.inc:493
+#: plugins/admin/fai/class_faiHook.inc:527
 msgid "Hook"
 msgstr "Hook"
 
-#: plugins/admin/fai/class_faiHook.inc:494
+#: plugins/admin/fai/class_faiHook.inc:528
 msgid "FAI hook"
 msgstr "FAI-Hook"
 
-#: plugins/admin/fai/class_faiHook.inc:501
+#: plugins/admin/fai/class_faiHook.inc:535
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiVariable.inc:420
 msgid "Read only"
 msgstr "Nur Lesen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 msgid "primary"
 msgstr "primär"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 msgid "logical"
 msgstr "logisch"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
 msgid "FS type"
 msgstr "Dateisystem"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
 #: plugins/admin/fai/class_faiSummaryTab.inc:317
 msgid "Mount point"
 msgstr "Mount-Punkt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
 #: plugins/admin/fai/class_faiSummaryTab.inc:316
 msgid "Size in MB"
 msgstr "Größe in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#: plugins/admin/fai/class_faiPartitionTable.inc:504
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
 #: plugins/admin/fai/class_faiSummaryTab.inc:315
 msgid "Mount options"
 msgstr "Mount-Optionen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 msgid "FS option"
 msgstr "Dateisystem-Option"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "Preserve"
 msgstr "Bewahren"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
 #, 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:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
 #, 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:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -13420,32 +13626,32 @@ msgstr ""
 "Dateisystem 'swap' wird bereits benutzt, ändern Sie bitte das Dateisystem "
 "für Partition %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 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:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
 #, 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:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
 #, 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:393
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
 #, 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_faiPartitionTableEntry.inc:408
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -13453,15 +13659,49 @@ msgstr ""
 "Sie haben mehr als 3 primäre Partitionen in ihrer Konfiguration. Bitte "
 "prüfen Sie die Konfiguration."
 
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#, fuzzy
+msgid "Partition table entry"
+msgstr "Partitionstabelle"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+msgid "FAI partition table entry"
+msgstr "FAI-Partitionstabellen-Eintrag"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+msgid "Partition type"
+msgstr "Partitionstyp"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+msgid "Partition no."
+msgstr "Partitionsnummer"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+msgid "File system type"
+msgstr "Dateisystem-Typ"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+msgid "Partition size"
+msgstr "Partitionsgröße"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+msgid "File system options"
+msgstr "Dateisystem-Optionen"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+msgid "Partition flags"
+msgstr "Partitions-Flags"
+
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 msgid "Device"
 msgstr "Gerät"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:24
 msgid "Partition entries"
 msgstr "Partitions-Einträge"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:28
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 msgid "Add partition"
 msgstr "Partition hinzufügen"
 
@@ -13469,19 +13709,27 @@ msgstr "Partition hinzufügen"
 msgid "List of scripts"
 msgstr "Liste der Skripte"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
+#: plugins/admin/fai/class_faiVariableEntry.inc:103
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Bitte geben Sie einen Wert für das Attribute 'Inhalt' an."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
-msgstr "Variablen-Attribute"
+#: plugins/admin/fai/class_faiVariableEntry.inc:134
+msgid "Variable entry"
+msgstr "Variablen-Eintrag"
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-#: plugins/admin/fai/class_faiVariable.inc:394
+#: plugins/admin/fai/class_faiVariableEntry.inc:135
+msgid "FAI variable entry "
+msgstr "FAI-Variablen-Eintrag"
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:144
+#: plugins/admin/fai/faiVariableEntry.tpl:38
 msgid "Variable content"
 msgstr "Variablen-Inhalt"
 
+#: plugins/admin/fai/faiVariableEntry.tpl:33
+msgid "Variable attributes"
+msgstr "Variablen-Attribute"
+
 #: plugins/admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "FAI-Objekthierarchie"
@@ -13495,7 +13743,7 @@ msgstr ""
 msgid "You are not allowed to view the fai summary."
 msgstr "Sie haben keine Berechtigung, die FAI Zusammenfassung einzusehen."
 
-#: plugins/admin/fai/faiTemplate.tpl:31
+#: plugins/admin/fai/faiTemplate.tpl:35
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
@@ -13503,75 +13751,51 @@ msgstr "Liste der Vorlagen"
 msgid "List of hook scripts"
 msgstr "Liste der Hook-Skripte"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:284
-#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#: plugins/admin/fai/class_faiPartitionTable.inc:313
+#: plugins/admin/fai/class_faiPartitionTable.inc:319
 #, php-format
 msgid "%s partition"
 msgstr "%s Partition"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:286
-#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#: plugins/admin/fai/class_faiPartitionTable.inc:315
+#: plugins/admin/fai/class_faiPartitionTable.inc:321
 #, php-format
 msgid "%s partition(s)"
 msgstr "%s Partition(en)"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:378
+#: plugins/admin/fai/class_faiPartitionTable.inc:408
 #, php-format
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Speichern von FAI/Partitionstabelle mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:491
+#: plugins/admin/fai/class_faiPartitionTable.inc:521
 msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:499
-msgid "Partition type"
-msgstr "Partitionstyp"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:500
-msgid "Partition no."
-msgstr "Partitionsnummer"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:501
-msgid "File system type"
-msgstr "Dateisystem-Typ"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:503
-msgid "Partition size"
-msgstr "Partitionsgröße"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:505
-msgid "File system options"
-msgstr "Dateisystem-Optionen"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:506
-msgid "Partition flags"
-msgstr "Partitions-Flags"
-
-#: plugins/admin/fai/class_faiHookEntry.inc:144
+#: plugins/admin/fai/class_faiHookEntry.inc:146
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
 
-#: plugins/admin/fai/class_faiHookEntry.inc:178
+#: plugins/admin/fai/class_faiHookEntry.inc:180
 #, fuzzy
 msgid "Hook entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:179
+#: plugins/admin/fai/class_faiHookEntry.inc:181
 #, fuzzy
 msgid "FAI hook entry"
 msgstr "FAI-Hook"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:188
+#: plugins/admin/fai/class_faiHookEntry.inc:190
 #: plugins/admin/fai/faiHookEntry.tpl:38
 msgid "Task"
 msgstr "Aufgabe"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Package bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Klassen-Name"
@@ -13664,96 +13888,121 @@ msgstr "Wählen Sie den Klassen-Namen"
 msgid "A new class name."
 msgstr "Ein neuer Klassen-Name."
 
-#: plugins/admin/fai/class_faiVariable.inc:306
+#: plugins/admin/fai/class_faiVariable.inc:334
 #, php-format
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Speichern von FAI/Variable mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/fai/class_faiVariable.inc:385
+#: plugins/admin/fai/class_faiVariable.inc:413
 msgid "FAI variable"
 msgstr "FAI-Variable"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_faiTemplateEntry.inc:95
 msgid "no file uploaded yet"
 msgstr "Es wurden noch keine Datei hochgeladen."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#: plugins/admin/fai/class_faiTemplateEntry.inc:101
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr "existiert in der Datenbank (Größe: %s Bytes)"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 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:188
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 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:196
+#: plugins/admin/fai/class_faiTemplateEntry.inc:200
 msgid "Please enter a user."
 msgstr "Bitte geben Sie einen Benutzer ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 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)."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/fai/class_faiTemplateEntry.inc:207
 msgid "Please enter a group."
 msgstr "Bitte geben Sie eine Gruppe ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/fai/class_faiTemplateEntry.inc:210
 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)."
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:21
+#: plugins/admin/fai/class_faiTemplateEntry.inc:239
+msgid "Template entry"
+msgstr "Vorlagen-Eintrag"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:240
+#, fuzzy
+msgid "FAI template entry"
+msgstr "FAI-Vorlage"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:249
+msgid "Template file"
+msgstr "Vorlagen-Datei"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:250
+msgid "Template path"
+msgstr "Vorlagen-Pfad"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:251
+msgid "File owner"
+msgstr "Datei-Besitzer"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:252
+msgid "File permissions"
+msgstr "Datei-Berechtigungen"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:25
 msgid "Template attributes"
 msgstr "Vorlagen-Attribute"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Save template"
 msgstr "Vorlage speichern"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#: plugins/admin/fai/faiTemplateEntry.tpl:57
 msgid "Destination path"
 msgstr "Ziel-Pfad"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/admin/fai/faiTemplateEntry.tpl:74
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Besitzer"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:80
+#: plugins/admin/fai/faiTemplateEntry.tpl:96
 msgid "Access"
 msgstr "Zugriff"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
 msgid "Read"
 msgstr "Lesen"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#: plugins/admin/fai/faiTemplateEntry.tpl:104
 msgid "Write"
 msgstr "Schreiben"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#: plugins/admin/fai/faiTemplateEntry.tpl:107
 msgid "Special"
 msgstr "Speziell"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#: plugins/admin/fai/faiTemplateEntry.tpl:124
 msgid "SUID"
 msgstr "SUID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#: plugins/admin/fai/faiTemplateEntry.tpl:141
 msgid "SGID"
 msgstr "SGID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:112
+#: plugins/admin/fai/faiTemplateEntry.tpl:144
 msgid "Others"
 msgstr "Andere"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:118
+#: plugins/admin/fai/faiTemplateEntry.tpl:158
 msgid "sticky"
 msgstr "sticky"
 
@@ -14001,71 +14250,71 @@ msgstr "Zeige FAI-Partitionstabellen"
 msgid "Show partitions"
 msgstr "Zeige Partitionen"
 
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "New scripts"
 msgstr "Neues Skript"
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "New hooks"
 msgstr "Neuer Hook"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "New variables"
 msgstr "Neue Variable"
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 msgid "New templates "
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 #, fuzzy
 msgid "I"
 msgstr "NI"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_divListFai.inc:227
-#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/fai/class_divListFai.inc:245
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_divListFai.inc:238
+#: plugins/admin/fai/class_divListFai.inc:253
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
 #: plugins/admin/mimetypes/generic.tpl:13
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
 msgid "Mime type"
 msgstr "MIME-Typ"
 
@@ -14233,7 +14482,7 @@ msgstr "MIME-Typ Name"
 msgid "Display mime types matching"
 msgstr "Zeige MIME-Typen, auf die Folgendes passt"
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 msgid "Create new mime type"
 msgstr "Neuen MIME-Typ erstellen"
 
@@ -14266,8 +14515,8 @@ msgstr "nicht definiert"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:259
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:656
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
+#: plugins/gofon/macro/class_gofonMacro.inc:95
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -14373,7 +14622,7 @@ msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:943
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:342
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -14408,7 +14657,7 @@ msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
@@ -14424,7 +14673,7 @@ msgstr "Telefon-PIN"
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
-#: plugins/gofon/phoneaccount/main.inc:114
+#: plugins/gofon/phoneaccount/main.inc:123
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
@@ -14459,23 +14708,20 @@ msgstr "Zeige Makros, auf die zutrifft"
 msgid "Regular expression for matching macro names"
 msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
+#: plugins/gofon/macro/class_gofonMacro.inc:483
 msgid "Macro name"
 msgstr "Makro-Name"
 
-#: plugins/gofon/macro/generic.tpl:12
+#: plugins/gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Makro-Name der angezeigt wird"
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Wählen Sie den Teilbaum, in den das Makro eingepflegt werden soll"
-
-#: plugins/gofon/macro/generic.tpl:48
+#: plugins/gofon/macro/generic.tpl:60
 msgid "Visible for user"
 msgstr "Sichtbar für Benutzer"
 
-#: plugins/gofon/macro/generic.tpl:57
+#: plugins/gofon/macro/generic.tpl:70
 msgid "Macro text"
 msgstr "Makro-Inhalt"
 
@@ -14483,22 +14729,22 @@ msgstr "Makro-Inhalt"
 msgid "Phone macros"
 msgstr "Telefon-Makros"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Sie sind dabei das Makro '%s' zu löschen."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
+#: plugins/gofon/macro/class_gofonMacro.inc:101
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
 msgid "This 'dn' is no phone macro."
 msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:187
+#: plugins/gofon/macro/class_gofonMacro.inc:185
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -14506,14 +14752,14 @@ 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:194
-#: plugins/gofon/macro/class_gofonMacro.inc:209
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:402
 #, php-format
 msgid "Removing of goFonMacro/generic account with dn '%s' failed."
 msgstr "Entfernen von GOfonMakro/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:222
+#: plugins/gofon/macro/class_gofonMacro.inc:220
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
@@ -14521,112 +14767,103 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:292
+#: plugins/gofon/macro/class_gofonMacro.inc:290
 #, 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:310
+#: plugins/gofon/macro/class_gofonMacro.inc:308
 #, 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:319
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:317
+#: plugins/gofon/macro/class_gofonMacro.inc:325
 #, 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:341
+#: plugins/gofon/macro/class_gofonMacro.inc:339
 #, 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:389
+#: plugins/gofon/macro/class_gofonMacro.inc:405
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:394
+#: plugins/gofon/macro/class_gofonMacro.inc:410
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 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:403
-#, 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:409
+#: plugins/gofon/macro/class_gofonMacro.inc:418
 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:414
+#: plugins/gofon/macro/class_gofonMacro.inc:423
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:466
 #, php-format
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Speichern von GOfonMakro/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:475
 msgid "Asterisk macro management"
 msgstr "Asterisk-Makro-Verwaltung"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:477
+#: plugins/gofon/macro/class_gofonMacro.inc:487
 msgid "Macro content"
 msgstr "Makro-Inhalt"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:478
+#: plugins/gofon/macro/class_gofonMacro.inc:488
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/parameter.tpl:4
 msgid "Argument"
 msgstr "Argument"
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/parameter.tpl:8
 msgid "type"
 msgstr "Typ"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
+#: plugins/gofon/macro/parameter.tpl:19
+#, fuzzy
+msgid "You are not allowed to view the marco parameter settings"
+msgstr "Sie haben keine Berechtigung, die FAI Zusammenfassung einzusehen."
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:258
 msgid "String"
 msgstr "Zeichenkette"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:259
 msgid "Combobox"
 msgstr "Auswahl-Gruppe"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:260
 msgid "Bool"
 msgstr "Schalter"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:266
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
-#, 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:341
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:347
 #, 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:370
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:376
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -14647,29 +14884,29 @@ msgstr "Makroname"
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
-#: plugins/gofon/macro/class_divListMacros.inc:129
+#: plugins/gofon/macro/class_divListMacros.inc:132
+#: plugins/gofon/macro/class_divListMacros.inc:160
 msgid "Edit macro"
 msgstr "Makro bearbeiten"
 
-#: plugins/gofon/macro/class_divListMacros.inc:112
-#: plugins/gofon/macro/class_divListMacros.inc:132
+#: plugins/gofon/macro/class_divListMacros.inc:134
+#: plugins/gofon/macro/class_divListMacros.inc:168
 msgid "Delete macro"
 msgstr "Makro entfernen"
 
-#: plugins/gofon/macro/class_divListMacros.inc:115
+#: plugins/gofon/macro/class_divListMacros.inc:137
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 msgid "invisible"
 msgstr "unsichtbar"
 
@@ -14694,61 +14931,59 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: plugins/gofon/conference/generic.tpl:13
+#: plugins/gofon/conference/generic.tpl:15
 msgid "Conference name"
 msgstr "Konferenz-Name"
 
-#: plugins/gofon/conference/generic.tpl:18
+#: plugins/gofon/conference/generic.tpl:21
 msgid "Name of conference to create"
 msgstr "Name der zu erzeugenden Konferenz"
 
-#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 msgid "Choose subtree to place conference in"
 msgstr "Wählen Sie den Teilbaum, in den die Konferenz eingepflegt werden soll"
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:90
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: plugins/gofon/conference/generic.tpl:104
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
+#: plugins/gofon/conference/generic.tpl:137
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:145
 #: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr "PIN"
 
-#: plugins/gofon/conference/generic.tpl:118
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
+#: plugins/gofon/conference/generic.tpl:157
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:165
 msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
-#: plugins/gofon/conference/generic.tpl:143
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+#: plugins/gofon/conference/generic.tpl:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:196
 msgid "Activate session menu"
 msgstr "Sitzungsmenü aktivieren"
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:204
 msgid "Announce users joining or leaving the conference"
 msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:212
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Telefon-Konferenzen"
 
@@ -14756,12 +14991,12 @@ msgstr "Telefon-Konferenzen"
 msgid "Management"
 msgstr "Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr "Entfernen von GOfonKonferenz/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -14769,24 +15004,24 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
 msgid "Please enter a PIN."
 msgstr "Bitte geben Sie eine PIN ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
 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:228
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Der Wert für 'Nummer' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Der Wert für 'Lebenszeit' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -14794,44 +15029,49 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
 #, php-format
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr "Speichern von GOfonKonferenz/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_divListConferences.inc:202
+msgid "Conference"
+msgstr "Konferenz"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
 msgid "GOfon"
 msgstr "GOfon"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
 msgid "Conference PIN"
 msgstr "Konferenz-PIN"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
 msgid "Activate menu"
 msgstr "Menü aktivieren"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
 msgid "Announce user activity"
 msgstr "Melde Benutzer-Aktivität"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
 msgid "Count user"
 msgstr "Zähle Benutzer"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
 msgid "Conference type"
 msgstr "Konferenz-Typ"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
 msgid "Format"
 msgstr "Format"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
@@ -14847,38 +15087,43 @@ msgstr "Name - Nummer"
 msgid "Regular expression for matching conference names"
 msgstr "Regulärer Ausdruck zum Erkennen von Konferenznamen"
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_divListConferences.inc:154
-msgid "Conference"
-msgstr "Konferenz"
+#: plugins/gofon/conference/class_divListConferences.inc:196
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
+msgid "Unknown"
+msgstr "Unbekannt"
 
 #: plugins/gofon/fonreports/contents.tpl:31
+#: plugins/gofon/fonreports/class_fonreport.inc:399
 msgid "Source"
 msgstr "Quelle"
 
 #: plugins/gofon/fonreports/contents.tpl:32
+#: plugins/gofon/fonreports/class_fonreport.inc:400
 msgid "Destination"
 msgstr "Ziel"
 
 #: plugins/gofon/fonreports/contents.tpl:33
+#: plugins/gofon/fonreports/class_fonreport.inc:401
 msgid "Channel"
 msgstr "Kanal"
 
 #: plugins/gofon/fonreports/contents.tpl:36
+#: plugins/gofon/fonreports/class_fonreport.inc:404
 msgid "Duration"
 msgstr "Dauer"
 
-#: plugins/gofon/fonreports/main.inc:21
-#: plugins/gofon/fonreports/class_fonreport.inc:356
-#: plugins/gofon/fonreports/class_fonreport.inc:357
-#: plugins/gofon/fonreports/class_fonreport.inc:365
+#: plugins/gofon/fonreports/main.inc:16
+#: plugins/gofon/fonreports/class_fonreport.inc:389
+#: plugins/gofon/fonreports/class_fonreport.inc:390
 msgid "Phone reports"
 msgstr "Telefon-Berichte"
 
@@ -14886,23 +15131,32 @@ msgstr "Telefon-Berichte"
 msgid "Phone Reports"
 msgstr "Telefon-Berichte"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofon/fonreports/class_fonreport.inc:170
 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:171
+#: plugins/gofon/fonreports/class_fonreport.inc:174
 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:189
+#: plugins/gofon/fonreports/class_fonreport.inc:192
 msgid "Query for phone database failed!"
 msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:402
+#, fuzzy
+msgid "Application called"
+msgstr "Name der Anwendung"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:403
+msgid "Disposition"
+msgstr "Disposition"
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -14952,7 +15206,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:386
+#: include/php_setup.inc:71 html/main.php:388
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -15075,11 +15329,11 @@ msgstr ""
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1120 include/functions.inc:1312
+#: include/functions.inc:1039 include/functions.inc:1226
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1121
+#: include/functions.inc:1040
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -15088,7 +15342,7 @@ msgstr ""
 "verloren gegangen sind. Bitte prüfen Sie die LDAP-Konfiguration um "
 "eventuelle Fehler aufzudecken und wiederholen Sie die Aktion."
 
-#: include/functions.inc:1129
+#: include/functions.inc:1048
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
@@ -15096,23 +15350,23 @@ msgstr ""
 "Bitte prüfen Sie ihre Eingaben und beheben Sie den Fehler. Drücken Sie den "
 "'OK'-Knopf um dieses Meldungsfenster zu schließen."
 
-#: include/functions.inc:1138
+#: include/functions.inc:1057
 msgid "An error occured while processing your request"
 msgstr "Es ist ein Fehler bei der Bearbeitung ihrer Anfrage aufgetreten"
 
-#: include/functions.inc:1142 include/functions_setup.inc:254
+#: include/functions.inc:1061 include/functions_setup.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: include/functions.inc:1204
+#: include/functions.inc:1123
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1206
+#: include/functions.inc:1125
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1208
+#: include/functions.inc:1127
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -15122,28 +15376,28 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1494
+#: include/functions.inc:1408
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1522
+#: include/functions.inc:1436
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1710
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1839
+#: include/functions.inc:1753
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
 
-#: include/class_mail-methods-cyrus.inc:39
+#: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr "Warnung: Das Konto hat eine ungültige Mail-Server Adresse!"
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_mail-methods-cyrus.inc:53
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -15151,52 +15405,52 @@ msgstr ""
 "Warnung: Der IMAP-Server kann nicht erreicht werden! Einige Mail-"
 "Einstellungen werden nicht auf den Server übertragen!"
 
-#: include/class_mail-methods-cyrus.inc:129
+#: include/class_mail-methods-cyrus.inc:151
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
 
-#: include/class_mail-methods-cyrus.inc:148
+#: include/class_mail-methods-cyrus.inc:170
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 "Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
 
-#: include/class_mail-methods-cyrus.inc:174
+#: include/class_mail-methods-cyrus.inc:196
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Achtung: Die PHP-Funktion 'imap_getacl' ist nicht verfügbar - "
 "Zugriffsinformationen können nicht entfernt werden."
 
-#: include/class_mail-methods-cyrus.inc:192
+#: include/class_mail-methods-cyrus.inc:214
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Achtung: Die PHP-Funktion imap_get_acl ist nicht verfügbar, die IMAP-"
 "Berechtigungen können nicht gelesen werden!"
 
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr "Kann das IMAP-Postfach nicht entfernen. Der Server meldete '%s'."
 
-#: include/class_mail-methods-cyrus.inc:242
+#: include/class_mail-methods-cyrus.inc:264
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 "Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
 
-#: include/class_mail-methods-cyrus.inc:255
+#: include/class_mail-methods-cyrus.inc:277
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 "Kann das aktive SIEVE-Skript nicht herunterladen. Die Meldung lautet '%s'."
 
-#: include/class_mail-methods-cyrus.inc:326
+#: include/class_mail-methods-cyrus.inc:348
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "Kann das SIEVE-Skript nicht übertragen. Die Meldung lautet '%s'."
 
-#: include/class_mail-methods-cyrus.inc:330
+#: include/class_mail-methods-cyrus.inc:352
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
@@ -15277,16 +15531,16 @@ msgstr ""
 msgid "Ldap import with dn '%s' failed."
 msgstr "LDAP-Import von dn '%s' fehlgeschlagen."
 
-#: include/class_tabs.inc:195
+#: include/class_tabs.inc:188
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 
-#: include/class_tabs.inc:310
+#: include/class_tabs.inc:306
 msgid "References"
 msgstr "Referenzen"
 
-#: include/class_plugin.inc:418
+#: include/class_plugin.inc:420
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15294,7 +15548,7 @@ msgstr ""
 "Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:599
+#: include/class_plugin.inc:601
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15302,7 +15556,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:633 include/class_password-methods.inc:181
+#: include/class_plugin.inc:635 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15310,7 +15564,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:667
+#: include/class_plugin.inc:669
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15318,37 +15572,37 @@ msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:973
+#: include/class_plugin.inc:975
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Objekt '%s' ist bereits markiert"
 
-#: include/class_plugin.inc:980
+#: include/class_plugin.inc:982
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
 
-#: include/class_plugin.inc:994 include/class_plugin.inc:1023
+#: include/class_plugin.inc:996 include/class_plugin.inc:1025
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr "Die Bearbeitung der Objekt-Markierung für dn '%s' ist fehlgeschlagen."
 
-#: include/class_plugin.inc:1010
+#: include/class_plugin.inc:1012
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Entferne Markierung von Objekt '%s'"
 
-#: include/class_plugin.inc:1071 include/class_plugin.inc:1117
-#: include/class_plugin.inc:1118
+#: include/class_plugin.inc:1073 include/class_plugin.inc:1119
+#: include/class_plugin.inc:1120
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Speichern des Abbilds von Objekt mit dn '%s' fehlgeschlagen."
 
-#: include/class_plugin.inc:1134 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1135
 msgid "You are not allowed to delete this snapshot!"
 msgstr "Sie haben keine Berechtigung, dieses Abbild zu löschen!"
 
-#: include/class_plugin.inc:1149
+#: include/class_plugin.inc:1151
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -15357,7 +15611,7 @@ msgstr ""
 "Die Abbild-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
 "s' ist nicht in ihrer gosa.conf konfiguriert."
 
-#: include/class_plugin.inc:1161
+#: include/class_plugin.inc:1163
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
@@ -15366,17 +15620,17 @@ msgstr ""
 "Die Abbild-Funktionalität ist aktiviert, aber die erforderliche(n) Variable"
 "(n) '%s' ist/sind nicht in ihrer gosa.conf konfiguriert."
 
-#: include/class_plugin.inc:1193
+#: include/class_plugin.inc:1195
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr "Konnte die verfügbaren Abbilder für dn '%s' nicht ermitteln."
 
-#: include/class_plugin.inc:1249
+#: include/class_plugin.inc:1251
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr "Konnte die entfernten Abbilder für dn '%s' nicht ermitteln."
 
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
+#: include/class_plugin.inc:1315 include/class_plugin.inc:1329
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Wiederherstellen des Abbilds mit dn '%s' fehlgeschlagen."
@@ -15397,11 +15651,6 @@ msgstr ""
 "Die Konfigurationsdatei gosa.conf hat sich teilweise geändert. Bitte "
 "konvertieren Sie diese mit dem beigefügten Skript fix_config.sh!"
 
-#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
-#: include/class_pluglist.inc:245
-msgid "Unknown"
-msgstr "Unbekannt"
-
 #: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -16233,7 +16482,7 @@ msgid "Restore"
 msgstr "Wiederherstellen"
 
 #: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:105
+#: include/class_SnapShotDialog.inc:106
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
@@ -16294,20 +16543,20 @@ msgstr "Fehler, die folgenden Objekte sollten gleich sein: '%s' und '%s'"
 msgid "Release management failed, can't save '%s'"
 msgstr "Release-Verwaltung fehlgeschlagen, kann '%s' nicht speichern"
 
-#: include/class_SnapShotDialog.inc:47
+#: include/class_SnapShotDialog.inc:53
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Sie sind dabei das Abbild '%s' zu entfernen."
 
-#: include/class_SnapShotDialog.inc:107
+#: include/class_SnapShotDialog.inc:108
 msgid "Remove snapshot"
 msgstr "Abbild entfernen."
 
-#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:141
+#: include/class_SnapShotDialog.inc:142
 msgid "Please specify a valid description for this snapshot."
 msgstr "Bitte geben Sie eine gültige Beschreibung für diesen Abzug an."
 
@@ -16366,16 +16615,16 @@ msgstr ""
 "Achtung: die Speichernutzung ist zu hoch - bitte erhöhen Sie das "
 "memory_limit!"
 
-#: html/main.php:347
+#: html/main.php:349
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: Es kann kein Plugin für die Definition '%s' gefunden werden!"
 
-#: html/main.php:362
+#: html/main.php:364
 msgid "Your password is about to expire, please change your password"
 msgstr "Ihr Passwort ist abgelaufen, geben Sie bitte ein neues Passwort eie"
 
-#: html/main.php:386
+#: html/main.php:388
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -16452,99 +16701,91 @@ msgstr ""
 "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies "
 "und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
 
-#: html/getxls.php:65
+#: html/getxls.php:86
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
+#: html/getxls.php:86 html/getxls.php:227 html/getxls.php:281
+#: html/getxls.php:297
 msgid "Surname"
 msgstr "Name"
 
-#: html/getxls.php:74
+#: html/getxls.php:94
 #, php-format
 msgid "User list of %s on %s"
 msgstr "Benutzerliste von %s am %s"
 
-#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
+#: html/getxls.php:121 html/getxls.php:284 ihtml/themes/default/acl.tpl:41
 msgid "Members"
 msgstr "Mitglieder"
 
-#: html/getxls.php:104 html/getxls.php:295
+#: html/getxls.php:131 html/getxls.php:360
 #, php-format
 msgid "Groups of %s on %s"
 msgstr "Gruppen von %s vom %s"
 
-#: html/getxls.php:124 html/getxls.php:246
-msgid "Computers"
-msgstr "Systeme"
-
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-msgid "Common name"
-msgstr "Name"
-
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+#: html/getxls.php:155 html/getxls.php:188 html/getxls.php:190
+#: html/getxls.php:197 html/getxls.php:233 html/getxls.php:310
+#: html/getxls.php:381
 msgid "Servers"
 msgstr "Server"
 
-#: html/getxls.php:156 html/getxls.php:314
+#: html/getxls.php:159 html/getxls.php:311
+msgid "Computers"
+msgstr "Systeme"
+
+#: html/getxls.php:195 html/getxls.php:379
 #, php-format
 msgid "Servers of %s on %s"
 msgstr "Server von %s vom %s"
 
-#: html/getxls.php:174
+#: html/getxls.php:225
 msgid "Mobile phone"
 msgstr "Mobiltelefon"
 
-#: html/getxls.php:174
+#: html/getxls.php:228
 msgid "Function"
 msgstr "Funktion"
 
-#: html/getxls.php:177 html/getxls.php:247
+#: html/getxls.php:231 html/getxls.php:312
 msgid "Adressbook"
 msgstr "Adressbuch"
 
-#: html/getxls.php:184 html/getxls.php:349
+#: html/getxls.php:238 html/getxls.php:414
 #, php-format
 msgid "Adressbook of %s on %s"
 msgstr "Adressbuch von  %s vom %s"
 
-#: html/getxls.php:190
+#: html/getxls.php:244
 msgid "Common Name"
 msgstr "Name"
 
-#: html/getxls.php:224
+#: html/getxls.php:281
 msgid "Day of birth"
 msgstr "Geburtsdatum"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Organizational unit"
 msgstr "Organisationeinheit"
 
-#: html/getxls.php:236
+#: html/getxls.php:300
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: html/getxls.php:236
-msgid "Title"
-msgstr "Titel"
-
-#: html/getxls.php:239
+#: html/getxls.php:304
 msgid "Full"
 msgstr "Voll"
 
-#: html/getxls.php:276
+#: html/getxls.php:341
 #, php-format
 msgid "User List of %s on %s"
 msgstr "Benutzerliste von %s vom %s"
 
-#: html/getxls.php:330
+#: html/getxls.php:395
 #, php-format
 msgid "Computers of %s on %s"
 msgstr "Systeme von %s vom %s"
@@ -16996,8 +17237,8 @@ msgid "ACLs for this object"
 msgstr "ACLs für dieses Objekt"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
-msgstr "Kopieren &amp; Einfügen - Assistent"
+msgid "Copy & paste wizard"
+msgstr "Kopieren & Einfügen - Assistent"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:4
 msgid ""
@@ -17010,7 +17251,7 @@ msgstr ""
 "Attribute. Bitte verwalten Sie die Werte, die unten angezeigt werden, um die "
 "Auflagen zu erfüllen."
 
-#: ihtml/themes/default/copyPasteDialog.tpl:21
+#: ihtml/themes/default/copyPasteDialog.tpl:20
 msgid "Operation complete"
 msgstr "Vorgang abgeschlossen"
 
@@ -17064,11 +17305,11 @@ msgstr ""
 "Wählen Sie ein Abbild und klicken Sie auf das Ordner-Bild, um es "
 "wiederherzustellen."
 
-#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:43
 msgid "Creating object snapshots"
 msgstr "Erstelle Objekte-Abbilder"
 
-#: ihtml/themes/default/snapshotdialog.tpl:47
+#: ihtml/themes/default/snapshotdialog.tpl:46
 msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
@@ -17078,14 +17319,51 @@ msgstr ""
 "innerhalb eines speziellen Zweiges Ihres Verzeichnisses gespeichert und kann "
 "später wieder hergestellt werden."
 
-#: ihtml/themes/default/snapshotdialog.tpl:62
+#: ihtml/themes/default/snapshotdialog.tpl:61
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: ihtml/themes/default/snapshotdialog.tpl:71
+#: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Reason for generating this snapshot"
 msgstr "Grund für das Erzeugen dieses Abbilds"
 
+#, fuzzy
+#~ msgid "Pgaer"
+#~ msgstr "Pager"
+
+#~ msgid "Select subtree to place blocklist in"
+#~ msgstr ""
+#~ "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
+
+#~ msgid "No permission to create a blocklist on this base."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
+#~ "anzulegen."
+
+#~ 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."
+
+#~ msgid "You've no permission to do LDAP imports."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu "
+#~ "importieren."
+
+#~ msgid "You've no permission to do LDAP exports."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu "
+#~ "exportieren."
+
+#~ msgid "Choose subtree to place macro in"
+#~ msgstr "Wählen Sie den Teilbaum, in den das Makro eingepflegt werden soll"
+
+#~ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+#~ msgstr ""
+#~ "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
+#~ "ändern."
+
 #~ msgid "File servive (Shares)"
 #~ msgstr "Datei-Dienst (Freigaben)"
 
@@ -17263,9 +17541,6 @@ msgstr "Grund für das Erzeugen dieses Abbilds"
 #~ msgid "Log"
 #~ msgstr "Protokoll"
 
-#~ msgid "Log service"
-#~ msgstr "Protokoll-Dienst"
-
 #~ msgid "Removing server services/gokrb with dn '%s' failed."
 #~ msgstr "Entfernen von Server-Dienste/GOkrb mit dn '%s' fehlgeschlagen."
 
@@ -17431,9 +17706,6 @@ msgstr "Grund für das Erzeugen dieses Abbilds"
 #~ msgid "mailEnabled"
 #~ msgstr "aktiviert"
 
-#~ msgid "Connectivity  account"
-#~ msgstr "Konnektivitäts-Konto"
-
 #~ msgid "GOsa intranet account"
 #~ msgstr "GOsa Intranet-Konto"
 
@@ -17568,9 +17840,6 @@ msgstr "Grund für das Erzeugen dieses Abbilds"
 #~ msgid "Saving FAX account failed"
 #~ msgstr "Speichern des FAX-Kontos fehlgeschlagen"
 
-#~ msgid "Saving addressbook entry failed"
-#~ msgstr "Speichern des Adressbucheintrags ist fehlgeschlagen"
-
 #~ msgid "Removing FAI script base failed"
 #~ msgstr "Entfernen der FAI-Skript-Basis fehlgeschlagen"
 
@@ -17637,9 +17906,6 @@ msgstr "Grund für das Erzeugen dieses Abbilds"
 #~ msgid "Removing ACL information failed"
 #~ msgstr "Entfernen der ACL-Informationen fehlgeschlagen"
 
-#~ msgid "All fields are writeable"
-#~ msgstr "Alle Felder sind änderbar"
-
 #~ msgid "Removing application information failed"
 #~ msgstr "Entfernen der Anwendungsinformationen ist fehlgeschlagen"