Code

Fixed Translation Strings.
[gosa.git] / locale / de / LC_MESSAGES / messages.po
index cc40e57b5410978a75a3f55bfdfd6d3dee8eae57..ece5b0842307be051d51542f2b056b17ac466a88 100644 (file)
@@ -8,23 +8,38 @@
 # This file is distributed under the same license as the GOsa2 package.
 # 
 # 
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
-"PO-Revision-Date: 2006-11-17 12:52+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
+"PO-Revision-Date: 2006-12-18 10:28+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"
-
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -32,8 +47,8 @@ msgstr "Mein Konto"
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
 msgid "Addons"
 msgstr "Zusätzliches"
 
@@ -45,28 +60,28 @@ msgstr "Zusätzliches"
 #: 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:1368
+#: plugins/personal/generic/class_user.inc:1367
 #: 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:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
 #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
 #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
 #: 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
@@ -77,9 +92,9 @@ msgstr "Zusätzliches"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
@@ -91,30 +106,30 @@ msgstr "Unix"
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
 #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
 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:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:184
 #: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -122,7 +137,7 @@ msgstr "Samba"
 
 #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
 #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -133,15 +148,14 @@ 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:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
 #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
 #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
 #: html/getxls.php:297
 msgid "Fax"
@@ -154,12 +168,12 @@ msgstr "Fax"
 #: 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:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
 #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
 #: plugins/admin/ogroups/class_phonequeue.inc:718
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -179,9 +193,9 @@ msgstr "Nagios"
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
 #: plugins/admin/ogroups/phonequeue.tpl:43
 #: plugins/gofon/conference/generic.tpl:121
 msgid "Options"
@@ -195,21 +209,21 @@ msgstr "Parameter"
 
 #: 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:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Startup"
 msgstr "Start"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
 msgid "Devices"
 msgstr "Geräte"
 
 #: 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:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
@@ -228,16 +242,16 @@ msgstr "Drucker"
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Information"
 msgstr "Information"
 
 #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
 #: plugins/admin/systems/class_goFaxServer.inc:85
 #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
 #: plugins/admin/systems/class_goGlpiServer.inc:84
 #: plugins/admin/systems/class_goCupsServer.inc:64
 #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -256,7 +270,6 @@ msgid "Services"
 msgstr "Dienste"
 
 #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
 msgid "FAI summary"
 msgstr "FAI Übersicht"
 
@@ -283,7 +296,7 @@ msgstr "Excel-Export"
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:50
 #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
 msgid "Import"
 msgstr "Importieren"
 
@@ -296,33 +309,32 @@ msgid "Partitions"
 msgstr "Partitionen"
 
 #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
 #: plugins/admin/fai/faiScriptEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Vorlagen"
 
 #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
 #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
 msgid "Summary"
 msgstr "Übersicht"
 
@@ -377,7 +389,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:62
+#: plugins/addons/addressbook/contents.tpl:65
 #: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
@@ -393,8 +405,8 @@ msgstr "Wählen Sie die hinzuzufügenden Adressen"
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
 msgid "Filters"
 msgstr "Filter"
 
@@ -408,7 +420,7 @@ msgstr "Wählen Sie die Abteilung"
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -459,22 +471,22 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: 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:591
+#: plugins/admin/groups/class_groupMail.inc:598
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
 #: plugins/admin/systems/workstation.tpl:94
 #: plugins/admin/systems/glpiPrinter.tpl:115
 #: plugins/admin/systems/glpiPrinter.tpl:149
 #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
 #: plugins/admin/systems/phonesettings.tpl:207
 #: plugins/admin/systems/phonesettings.tpl:230
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
 #: plugins/admin/systems/terminalStartup.tpl:79
 #: plugins/admin/systems/terminalStartup.tpl:108
 #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -482,12 +494,12 @@ 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:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
 #: plugins/admin/systems/goShareServer.tpl:14
 #: plugins/admin/systems/goMailServer.tpl:70
 #: plugins/admin/systems/goMailServer.tpl:101
@@ -500,7 +512,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:33
 #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
 #: plugins/admin/fai/faiPartitionTable.tpl:48
 #: plugins/admin/fai/faiPartitionTable.tpl:50
 #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -549,15 +561,17 @@ msgstr "Hinzufügen"
 #: 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:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
 #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
 #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -565,7 +579,7 @@ msgstr "Hinzufügen"
 #: plugins/admin/systems/servRepository.tpl:68
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
@@ -578,26 +592,27 @@ msgstr "Hinzufügen"
 #: plugins/admin/systems/SelectDeviceType.tpl:45
 #: plugins/admin/systems/class_baseSelectDialog.inc:43
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
 #: plugins/admin/systems/class_goService.inc:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:83
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -609,17 +624,17 @@ msgstr "Hinzufügen"
 #: plugins/admin/fai/faiPackageNew.tpl:51
 #: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/admin/mimetypes/remove.tpl:15
 #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
 #: 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:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -631,11 +646,11 @@ 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:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -650,14 +665,14 @@ msgstr "Kontingent-Nutzung"
 
 #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
 msgid "not defined"
 msgstr "nicht definiert"
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
@@ -696,22 +711,23 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
 #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
 #: plugins/admin/systems/workstation.tpl:98
 #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
 #: plugins/admin/systems/remove_glpi.tpl:14
 #: plugins/admin/systems/phonesettings.tpl:210
 #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
 #: plugins/admin/systems/terminalStartup.tpl:82
 #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/systems/glpi_edit_os.tpl:10
 #: 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:486
+#: plugins/admin/systems/class_termDNS.inc:491
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -786,7 +802,7 @@ msgid "MB"
 msgstr "MB"
 
 #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
@@ -817,7 +833,7 @@ 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:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
@@ -835,13 +851,14 @@ msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 #: plugins/admin/groups/class_groupManagement.inc:329
 #: plugins/admin/users/class_userManagement.inc:651
 #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
 msgid "Ok"
 msgstr "Ok"
 
@@ -1038,13 +1055,13 @@ msgstr ""
 "System hinzu."
 
 #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
 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:785
 #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
 #: plugins/admin/ogroups/class_mailogroup.inc:79
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
@@ -1052,26 +1069,26 @@ msgstr ""
 "ein."
 
 #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
 #: 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:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
 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:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
 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:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
 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."
 
@@ -1101,60 +1118,64 @@ msgstr ""
 "Bitte entfernen Sie zunächst das Mail-Konto, damit Kolab Gelegenheit hat "
 "seine Einstellungen zu entfernen."
 
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+msgid "Mail account"
+msgstr "Mail-Konto"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
 #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
 #: plugins/admin/systems/servdnseditzone.tpl:51
 #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
 msgid "Add vacation information"
 msgstr "Urlaubsinformationen hinzufügen"
 
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
 msgid "Reject due to mailsize"
 msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
 msgid "No delivery to own mailbox "
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
 msgid "Mail alternative addresses"
 msgstr "Weitere Adressen"
 
@@ -1224,8 +1245,9 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: 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:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1235,13 +1257,14 @@ msgid "Back"
 msgstr "Zurück"
 
 #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
 #: 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:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
 #: plugins/admin/systems/goImapServer.tpl:34
 #: plugins/admin/systems/class_goFonServer.inc:107
 #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1254,7 +1277,7 @@ msgid "Password"
 msgstr "Passwort"
 
 #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
 msgid "User password"
 msgstr "Benutzerpasswort"
 
@@ -1307,12 +1330,12 @@ 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
+#: plugins/admin/users/class_divListUsers.inc:249
 msgid "Change password"
 msgstr "Passwort ändern"
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
 #: 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:645
@@ -1320,7 +1343,7 @@ msgid "Home directory"
 msgstr "Basisverzeichnis"
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
 msgid "Shell"
 msgstr "Shell"
 
@@ -1329,10 +1352,10 @@ msgid "Primary group"
 msgstr "Primäre Gruppe"
 
 #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
 #: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
@@ -1350,7 +1373,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
 msgid "GID"
 msgstr "GID"
 
@@ -1393,7 +1416,7 @@ msgstr "Zeige Gruppen der Abteilung"
 #: 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/acl/class_divListACL.inc:56
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
 #: plugins/gofon/macro/class_divListMacros.inc:57
 #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1450,53 +1473,53 @@ msgstr "UNIX-Einstellungen"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "expired"
 msgstr "abgelaufen"
 
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
 msgid "grace time active"
 msgstr "Nachfrist aktiv"
 
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "active, password not changable"
 msgstr "aktiv, Passwort kann nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
 msgid "active, password expired"
 msgstr "aktiv, Passwort abgelaufen"
 
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
 msgid "active"
 msgstr "aktiv"
 
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
 #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto besitzt keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1504,7 +1527,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:278
+#: plugins/personal/posix/class_posixAccount.inc:271
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1512,11 +1535,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:281
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1524,28 +1547,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:442
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, 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:446
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Der Benutzer muß sein Passwort nach %s Tagen ändern"
 
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
 #, 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:454
+#: plugins/personal/posix/class_posixAccount.inc:447
 #, 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:493
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1554,7 +1577,7 @@ msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 msgid "January"
 msgstr "Januar"
 
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1563,7 +1586,7 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1572,7 +1595,7 @@ msgstr "Februar"
 msgid "March"
 msgstr "März"
 
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1581,7 +1604,7 @@ msgstr "März"
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1590,7 +1613,7 @@ msgstr "April"
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1599,7 +1622,7 @@ msgstr "Mai"
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1608,7 +1631,7 @@ msgstr "Juni"
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1617,7 +1640,7 @@ msgstr "Juli"
 msgid "August"
 msgstr "August"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1626,7 +1649,7 @@ msgstr "August"
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1635,7 +1658,7 @@ msgstr "September"
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1644,7 +1667,7 @@ msgstr "Oktober"
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1653,151 +1676,152 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
 #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: 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:622
+#: 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:770
+#: plugins/personal/posix/class_posixAccount.inc:762
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: 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:924
+#: 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:927
+#: 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:935
+#: 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:938
+#: 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:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: 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:958
+#: 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:963
+#: 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:966
+#: 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:969
+#: 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:972
+#: 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:977
+#: 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:980
+#: 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:985
+#: 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:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
 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:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
 msgid "POSIX account"
 msgstr "POSIX-Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+msgid "Posix Account"
+msgstr "Posix-Konto"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 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:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
 msgid "Force password change on login"
 msgstr "Erzwinge Änderung des Passwort bei Anmeldung"
 
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1335
-#, fuzzy
+#: plugins/personal/posix/class_posixAccount.inc:1328
 msgid "Shadow warning"
-msgstr "Spiegeln"
+msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1336
-#, fuzzy
+#: plugins/personal/posix/class_posixAccount.inc:1329
 msgid "Shadow inactive"
-msgstr "Spiegeln"
+msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1337
-#, fuzzy
+#: plugins/personal/posix/class_posixAccount.inc:1330
 msgid "Shadow expire"
-msgstr "Zeige Personen"
+msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
 msgid "System trust model"
 msgstr "Modell des System-Vertrauens"
 
@@ -1828,7 +1852,7 @@ msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
 #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
@@ -1837,7 +1861,7 @@ msgid "Temporary disable samba account"
 msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
 
 #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
 msgid "Domain"
 msgstr "Domäne"
 
@@ -1846,12 +1870,12 @@ msgid "Terminal Server"
 msgstr "Terminal-Server"
 
 #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
 #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
@@ -1916,17 +1940,17 @@ msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
 #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
 #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
 #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
@@ -2068,35 +2092,39 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Samba-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+msgid "Samba account"
+msgstr "Samba-Konto"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 msgid "Allow user to change password"
 msgstr "Benutzer darf sein Passwort ändern"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 msgid "Account expires"
 msgstr "Konto läuft ab"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 msgid "Password expires"
 msgstr "Passwort läuft ab"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
 msgid "Generic home directory"
 msgstr "Allgemeines Basisverzeichnis"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
 msgid "Generic samba home drive"
 msgstr "Allgemeines Samba Basis-Laufwerk"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
 msgid "Generic script path"
 msgstr "Allgemeiner Skript-Pfad"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
 msgid "Generic profile path"
 msgstr "Allgemeiner Profil-Pfad"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
 msgid "Allow connection from"
 msgstr "Erlaube Verbindung von"
 
@@ -2112,17 +2140,17 @@ msgstr "männlich"
 msgid "This account has no valid GOsa extensions."
 msgstr "Dieses Konto besitzt keine gültigen GOsa-Erweiterungen."
 
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
 "abgebrochen."
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
 msgid "Please enter a valid serial number"
 msgstr "Bitte geben Sie eine gültige Seriennummer ein"
 
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -2130,88 +2158,75 @@ msgstr ""
 "(Manche Zertifikate werden momentan nicht unterstützt und werden daher als "
 "'ungültig' angezeigt)."
 
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Zertifkat ist gültig im Zeitraum von %s bis %s (momentan: %s)."
 
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
 #, 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:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
 #, 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:933
+#: plugins/personal/generic/class_user.inc:935
 #, 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:1008
+#: plugins/personal/generic/class_user.inc:1010
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:1049
-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:1052
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, diesen Benutzer in die angegebene 'Basis' zu "
-"verschieben."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
 #: plugins/admin/users/class_userManagement.inc:471
 #: plugins/admin/users/class_userManagement.inc:549
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
 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:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
 #: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/users/class_userManagement.inc:552
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2219,7 +2234,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2227,119 +2242,119 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
 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:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
 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:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
 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:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
 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:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
 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:1222
+#: plugins/personal/generic/class_user.inc:1221
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
 #: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
 #: plugins/personal/generic/generic.tpl:459
 #: 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:1369
+#: plugins/personal/generic/class_user.inc:1368
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:91
@@ -2349,206 +2364,207 @@ msgstr "Allgemeine Benutzereinstellungen"
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
 #: plugins/personal/generic/generic.tpl:143
 #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
 #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
 #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
 #: 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:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
 #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
 #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
 #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
 #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
 msgid "Surename"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 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:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
 #: plugins/personal/generic/generic.tpl:73
 #: 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:1384
+#: plugins/personal/generic/class_user.inc:1383
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
 #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
 #: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
 #: 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:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
 #: plugins/gofon/macro/class_divListMacros.inc:52
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
 #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
 #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
 #: plugins/admin/systems/class_glpiAccount.inc:782
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
 #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
 #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
 #: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
 #: html/getxls.php:298 html/getxls.php:300
 msgid "Postal address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
 msgid "Fax number"
 msgstr "Faxnummer"
 
@@ -2622,7 +2638,7 @@ 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:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:56
 #: plugins/gofon/conference/generic.tpl:62
 msgid "Select a base"
@@ -2635,7 +2651,7 @@ msgstr "Wählen Sie eine Basis"
 #: 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/departments/class_departmentGeneric.inc:592
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr "Adresse"
@@ -2693,7 +2709,7 @@ msgstr "Mobiltelefon"
 #: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:79
 #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
 #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
 #: html/getxls.php:300
 msgid "Pager"
@@ -2716,6 +2732,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:27
 #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
 msgid "Remove picture"
 msgstr "Bild entfernen"
 
@@ -2723,37 +2740,38 @@ msgstr "Bild entfernen"
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
 #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
 #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
 #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
 #: plugins/admin/systems/class_goService.inc:33
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
 #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
 msgid "Save"
 msgstr "Speichern"
 
@@ -2775,21 +2793,21 @@ msgstr "Standard-Zertifikat"
 #: plugins/personal/connectivity/class_kolabAccount.inc:258
 #: plugins/personal/environment/environment.tpl:159
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
 #: plugins/admin/applications/class_applicationParameters.inc:124
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/glpiPrinter.tpl:152
 #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
 #: plugins/admin/systems/terminalStartup.tpl:111
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
 #: plugins/admin/systems/goMailServer.tpl:73
 #: plugins/admin/systems/goMailServer.tpl:104
 #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2818,6 +2836,7 @@ msgid "Set new password"
 msgstr "Neues Passwort setzen"
 
 #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
 msgid "FTP account"
 msgstr "FTP Konto"
 
@@ -2873,6 +2892,7 @@ msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
 #: plugins/personal/connectivity/proxy.tpl:23
 #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
 msgid "Proxy account"
 msgstr "Proxy Konto"
 
@@ -2887,7 +2907,7 @@ msgid "Limit proxy access to working time"
 msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
 #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
 msgid "Restrict proxy usage by quota"
 msgstr "Proxynutzung durch Kontingent einschränken"
 
@@ -2923,19 +2943,24 @@ msgstr "PHP GW Konto-Einstellungen"
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
 #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
 #: plugins/personal/connectivity/class_pptpAccount.inc:159
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
 #: plugins/personal/connectivity/class_opengwAccount.inc:310
 msgid "Connectivity addon"
 msgstr "Konnektivitäts-Erweiterung"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+msgid "PHPgroupware"
+msgstr "PHPgroupware"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
 
 #: plugins/personal/connectivity/kolab.tpl:3
 #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
 msgid "Kolab account"
 msgstr "Kolab-Konto"
 
@@ -2948,7 +2973,7 @@ msgstr ""
 "werden, wenn Sie ein Postfach hinzufügen."
 
 #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
 msgid "Delegations"
 msgstr "Stellvertreter"
 
@@ -2980,7 +3005,7 @@ msgid "days"
 msgstr "Tage"
 
 #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
@@ -3063,15 +3088,15 @@ msgstr "Speichern von Benutzer/Kolab-Konto mit dn '%s' fehlgeschlagen."
 msgid "Kolab account settings"
 msgstr "Kolab Konto-Einstellungen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
 msgid "Free busy future"
 msgstr "Frei/Belegt Ausblick"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
 msgid "Mail size restriction"
 msgstr "Beschränkung der Nachrichtengröße"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
 msgid "Free busy information"
 msgstr "Frei/Belegt-Information"
 
@@ -3091,6 +3116,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Speichern von Benutzer/webDAV-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
 #: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "WebDAV-Konto"
@@ -3142,27 +3168,27 @@ msgstr "FTP"
 msgid "Pure ftp account"
 msgstr "PureFTP-Konto"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
 msgid "Quota files"
 msgstr "Kontingent-Dateien"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
 msgid "Upload ratio"
 msgstr "Upload-Verhältnis"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
 msgid "Quota MBytes"
 msgstr "Kontingent-Größe"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
 msgid "Download ratio"
 msgstr "Download-Verhältnis"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
 msgid "Upload bandwith"
 msgstr "Upload-Bandbreite"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
 msgid "Download bandwith"
 msgstr "Download-Bandbreite"
 
@@ -3264,19 +3290,24 @@ msgstr "Open-Xchange"
 msgid "Open xchange account settings"
 msgstr "Open-Xchange Konto-Einstellungen"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+msgid "OpenExchange account"
+msgstr "OpenExchange-Konto"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
 msgid "OXAppointmentDays"
 msgstr "OX-Tage für Termin"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
 msgid "OXTaskDays"
 msgstr "OX-Tage für Aufgabe"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
 msgid "OXTimeZone"
 msgstr "OX-Zeitzone"
 
 #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
@@ -3337,16 +3368,17 @@ msgstr ""
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Speichern von Benutzert/Proxy-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
 msgid "Filter unwanted content"
 msgstr "Filtere ungewünschten Inhalt"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
 msgid "Limit proxy access"
 msgstr "Beschränke Proxy-Zugriff"
 
 #: plugins/personal/connectivity/pptp.tpl:3
 #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
 msgid "PPTP account"
 msgstr "PPTP-Konto"
 
@@ -3365,7 +3397,7 @@ msgstr "Entfernen von Benutzer/Intranet-Konto mit dn '%s' fehlgeschlagen."
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Speichern von Benutzer/Intranet-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
 msgid "Intranet account settings"
 msgstr "Einstellungen für Intranet-Konto"
 
@@ -3390,29 +3422,30 @@ msgstr "Speichern von Benutzer/PPTP-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/connectivity/opengw.tpl:1
 #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
 msgid "Opengroupware"
 msgstr "Opengroupware"
 
 #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
 msgid "Location team"
 msgstr "Örtliches Team"
 
 #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
 msgid "Template user"
 msgstr "Benutzer-Vorlage"
 
 #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
 msgid "Locked"
 msgstr "Gesperrt"
 
 #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
 msgid "Teams"
 msgstr "Teams"
 
@@ -3442,6 +3475,10 @@ msgstr "PHP Schedule It"
 msgid "PHP Schedule it settings"
 msgstr "PHP Schedule It Einstellungen"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+msgid "PHP schedule it"
+msgstr "PHP schedule it"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Opengroupware-Konto"
@@ -3501,7 +3538,7 @@ msgid "Profil quota"
 msgstr "Profil-Kontingent"
 
 #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
 msgid "Cache profile localy"
 msgstr "Profil lokal zwischenspeichern"
 
@@ -3510,7 +3547,7 @@ msgid "Kiosk profile settings"
 msgstr "Kiosk-Profil-Einstellungen"
 
 #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
 msgid "Kiosk profile"
 msgstr "Kiosk-Profil"
 
@@ -3519,22 +3556,22 @@ msgid "Manage"
 msgstr "Verwalten"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
 msgid "Resolution changeable during session"
 msgstr "Auflösung änderbar während des Betriebs"
 
 #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
 #: plugins/admin/systems/workstationService.tpl:122
 #: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr "Auflösung"
 
 #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
 #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
 #: plugins/admin/systems/terminalStartup.tpl:87
 #: plugins/admin/systems/goShareServer.tpl:1
 msgid "Shares"
@@ -3563,7 +3600,7 @@ msgid "Logon script management"
 msgstr "Verwaltung der Anmelde-Skripte"
 
 #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
 
@@ -3573,7 +3610,7 @@ msgstr "Einstellungen der Hotplug-Geräte"
 
 #: plugins/personal/environment/environment.tpl:219
 #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
 msgid "New"
 msgstr "Neu"
 
@@ -3631,7 +3668,7 @@ msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
 #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
 
@@ -3670,8 +3707,8 @@ msgid "auto"
 msgstr "auto"
 
 #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
 #, php-format
 msgid ""
 "You have specified an external resolution hook which can't be read, please "
@@ -3747,7 +3784,7 @@ msgstr "Sie haben keine Berechtigung, Anmeldeskripte zu speichern."
 #: 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:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
@@ -3816,27 +3853,29 @@ msgid "Administrator"
 msgstr "Administrator"
 
 #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
 msgid "Default printer"
 msgstr "Standard Drucker"
 
 #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
 msgid "Environment settings"
 msgstr "Umgebungs-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
 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:1284
+#: plugins/personal/environment/class_environment.inc:1287
 msgid "Profile quota"
 msgstr "Profil-Kontingent"
 
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
 msgid "Profile server"
 msgstr "Profilserver"
 
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Anmelde-Skript"
@@ -3884,31 +3923,31 @@ msgstr "Skriptname"
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
 #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
 #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
 #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
 #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
 #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
 #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
 #: plugins/admin/systems/class_goMailServer.inc:695
 #: plugins/admin/systems/class_goShareServer.inc:372
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
 #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
 #: plugins/admin/fai/faiPackage.tpl:21
 #: plugins/admin/fai/faiPartitionTable.tpl:21
 #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3916,7 +3955,7 @@ msgstr "Skriptname"
 #: 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/class_faiPartitionTableEntry.inc:464
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
 #: plugins/admin/fai/faiScript.tpl:21
 #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3925,16 +3964,16 @@ msgstr "Skriptname"
 #: 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:421
+#: plugins/admin/fai/class_faiVariable.inc:417
 #: 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/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
 #: plugins/admin/mimetypes/paste_generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
 #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
 #: html/getxls.php:287
 msgid "Description"
@@ -3966,11 +4005,11 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 #: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:82
 #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -3979,9 +4018,9 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 #: 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:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
 #: 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"
@@ -4035,28 +4074,24 @@ msgid "Serial number"
 msgstr "Seriennumner"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
-#, fuzzy
 msgid "(iSerial)"
-msgstr "Seriell"
+msgstr "(iSeriell)"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:36
-#, fuzzy
 msgid "Vendor-ID"
-msgstr "Anbieter ID"
+msgstr "Anbieter-ID"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:36
-#, fuzzy
 msgid "(idVendor)"
-msgstr "Anbieter ID"
+msgstr "(idAnbieter)"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:43
 msgid "Product-ID"
 msgstr "Produkt-ID"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:43
-#, fuzzy
 msgid "(idProduct)"
-msgstr "Produkt ID"
+msgstr "(idProdukt)"
 
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
@@ -4077,7 +4112,7 @@ msgstr "Durchsuchen"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
 #: include/class_MultiSelectWindow.inc:81
 msgid "Close"
 msgstr "Schliessen"
@@ -4087,37 +4122,37 @@ msgid "Nagios Account"
 msgstr "Nagios-Konto"
 
 #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
 msgid "Host notification period"
 msgstr "Frequenz der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
 msgid "Service notification period"
 msgstr "Frequenz der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
 msgid "Service notification options"
 msgstr "Optionen der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
 msgid "Host notification options"
 msgstr "Optionen der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
 msgid "Service notification commands"
 msgstr "Befehle für Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
 msgid "Host notification commands"
 msgstr "Befehle für Host-Meldungen"
 
@@ -4209,31 +4244,35 @@ msgstr "Entfernen von Benutzer/Nagios-Konto mit dn '%s' fehlgeschlagen."
 msgid "Nagios account settings"
 msgstr "Nagios-Konto-Einstellungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+msgid "Nagios account"
+msgstr "Nagios-Konto"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
 msgid "View all hosts"
 msgstr "Alle Systeme anzeigen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
 msgid "View all services"
 msgstr "Alle Dienste anzeigen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
 msgid "Trigger system commands"
 msgstr "Auslösen aller System-Befehle"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
 msgid "Trigger all host commands"
 msgstr "Auslösen aller Host-Befehle"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
 msgid "Trigger all service commands"
 msgstr "Auslösen aller Dienst-Befehle"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
 msgid "View configuration information"
 msgstr "Konfiguration anzeigen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
 msgid "View system informations"
 msgstr "System-Informationen anzeigen"
 
@@ -4242,7 +4281,7 @@ msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
 #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
 msgid "Share"
 msgstr "Freigabe"
 
@@ -4303,10 +4342,13 @@ msgstr "Speichern von Benutzer/Netatalk-Konto mit dn '%s' fehlgeschlagen."
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Entfernen von Benutzer/Netatalk-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/netatalk/class_netatalk.inc:364
-#, fuzzy
+#: plugins/personal/netatalk/class_netatalk.inc:360
+msgid "Netatalk account"
+msgstr "Netatalk-Konto"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
 msgid "User home path"
-msgstr "Profil-Pfad"
+msgstr "Benutzer Basisverzeichnis"
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -4337,9 +4379,9 @@ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
 msgid "Type"
 msgstr "Typ"
 
@@ -4362,13 +4404,15 @@ msgstr "Nummern können auch Platzhalter enthalten."
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
 #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
 #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2
 msgid "Warning"
@@ -4399,77 +4443,73 @@ msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Sie möchten die Sperrliste '%s' löschen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
 msgid "You have no permission to remove this blocklist."
 msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
 msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
 #, php-format
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Entfernen von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: 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:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
 #, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Speichern von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
-msgid "Fax Blocklists"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+msgid "Fax blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
 #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: 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
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4489,10 +4529,10 @@ msgstr "Fax-Sperrlisten"
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/class_goShareServer.inc:370
 #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
 #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4500,7 +4540,7 @@ msgstr "Fax-Sperrlisten"
 #: 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/class_faiPartitionTableEntry.inc:463
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiScript.tpl:9
 #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4509,22 +4549,22 @@ msgstr "Fax-Sperrlisten"
 #: 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:420
+#: plugins/admin/fai/class_faiVariable.inc:416
 #: 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/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
 #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
 #: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
 msgid "Blocklist"
 msgstr "Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
 msgid "Blocklist type"
 msgstr "Typ der Sperrliste"
 
@@ -4590,7 +4630,7 @@ msgstr "Zeige eingehende Sperrlisten"
 #: 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/acl/class_divListACL.inc:56
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
 #: plugins/gofon/macro/class_divListMacros.inc:57
 #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4601,242 +4641,107 @@ 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:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: 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:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: 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:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: 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:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: 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:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: 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:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: 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:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: 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: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: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:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: 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:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: 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:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: 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:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: 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:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: 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:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: 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: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: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: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: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:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
 msgid "New Blocklist"
 msgstr "Neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: 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:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: 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
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: 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/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr "Übertragen"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
 #: 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:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: 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/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
 #: 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
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: 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:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
 #: 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
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
@@ -4846,7 +4751,7 @@ 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:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
 #: plugins/admin/ogroups/phonequeue.tpl:47
 #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
 #: html/getxls.php:281
@@ -4858,7 +4763,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:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Delivery format"
 msgstr "Auslieferungsformat"
 
@@ -4879,12 +4784,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:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Deliver fax as mail"
 msgstr "Als Mail ausliefern"
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Deliver fax to printer"
 msgstr "Fax an Drucker weiterleiten"
 
@@ -4951,15 +4856,15 @@ msgstr "Fax-Einstellungen"
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid "This account has no fax extensions."
 msgstr "Dieses Konto besitzt keine Fax-Erweiterungen."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
 msgid "Remove fax account"
 msgstr "Fax-Konto entfernen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -4967,11 +4872,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:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
 msgid "Create fax account"
 msgstr "Fax-Konto erzeugen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -4979,40 +4884,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:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
 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:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
 #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
 msgid "back"
 msgstr "zurück"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
 #, 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:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr "Das benötigte Feld 'Fax' ist nicht gesetzt."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
 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:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 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:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 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:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -5020,28 +4925,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:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
 #, 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:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
 msgid "Fax account settings"
 msgstr "Fax-Konto-Einstellungen"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
 msgid "Enable/Disable fax"
 msgstr "FAX aktivieren/deaktivieren"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
 msgid "Receive blocklist"
 msgstr "Emfangs-Sperrliste"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Send blocklist"
 msgstr "Sende-Sperrliste"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Alternate fax number"
 msgstr "Alternative Fax-Nummer"
 
@@ -5056,7 +4961,7 @@ msgid "Filter"
 msgstr "Filter"
 
 #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
@@ -5095,17 +5000,17 @@ msgstr "Suchen"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
 #: plugins/admin/fai/faiTemplateEntry.tpl:110
 msgid "User"
 msgstr "Benutzer"
 
 #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
 msgid "Date"
 msgstr "Datum"
 
@@ -5146,22 +5051,22 @@ msgid "Date / Time"
 msgstr "Datum / Zeit"
 
 #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
 msgid "Sender MSN"
 msgstr "Absender-MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
 msgid "Sender ID"
 msgstr "Absender-ID"
 
 #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
 msgid "Receiver MSN"
 msgstr "Empfänger-MSN"
 
 #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
 msgid "Receiver ID"
 msgstr "Empfänger-ID"
 
@@ -5170,7 +5075,7 @@ msgid "Status message"
 msgstr "Status-Nachricht"
 
 #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
 msgid "Transfer time"
 msgstr "Übertragungszeit"
 
@@ -5182,7 +5087,7 @@ msgstr "Fax-Berichte"
 msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
 msgid ""
 "No fax extension defined in your server configuration, no reports can be "
 "shown!"
@@ -5190,7 +5095,7 @@ msgstr ""
 "Keine Fax-Erweiterung in der Server-Konfiguration definiert, Berichte können "
 "daher nicht angezeigt werden!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
 #: 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."
@@ -5198,73 +5103,78 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
 "Setup."
 
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
 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:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
 msgid "Can't select fax database for report generation!"
 msgstr "Kann die Fax-Datenbank zur Berichterstellung nicht öffnen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
 msgid "Can't query fax table 'faxlog' for report generation!"
 msgstr "Kann die Fax-Tabelle 'faxlog' nicht zur Berichterstellung abfragen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
 msgid "Query for fax database failed!"
 msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
 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:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
 #: 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/gofax/faxreports/class_faxreport.inc:309
 #: plugins/admin/groups/class_groupApplication.inc:427
 #: plugins/gofon/fonreports/class_fonreport.inc:204
 msgid "Insufficient permissions"
 msgstr "Unzureichende Berechtigungen"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
 msgid "Fax report"
 msgstr "Fax-Bericht"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
 msgid "All entries are readonly"
 msgstr "Alle Einträge sind nur lesbar"
 
 #: plugins/gofax/faxreports/class_faxreport.inc:479
+msgid "Fax reports"
+msgstr "Fax-Berichte"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
 msgid "Detailed view"
 msgstr "Detaillierte Ansicht"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
 msgid "Fax ID"
 msgstr "Fax-ID"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 msgid "Time"
 msgstr "Zeit"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
 msgid "Number of pages"
 msgstr "Anzahl der Seiten"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
@@ -5292,44 +5202,44 @@ msgstr ""
 msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
 #: plugins/admin/groups/class_groupApplication.inc:756
 msgid "Edit entry"
 msgstr "Eintrag bearbeiten"
 
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
 msgid "Remove entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
 msgid "Select to see regular users"
 msgstr "Wählen Sie dies, um gewöhnliche Benutzer anzuzeigen"
 
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
 msgid "Show organizational entries"
 msgstr "Zeige Benutzer der Organisation"
 
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
 msgid "Select to see users in addressbook"
 msgstr "Wählen, um Adressbucheinträge zu sehen"
 
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
 msgid "Show addressbook entries"
 msgstr "Zeige Adressbuch-Einträge"
 
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
 msgid "Display results for department"
 msgstr "Zeige Ergebnisse der Abteilung"
 
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
 msgid "Match object"
 msgstr "Untersuchtes Objekt"
 
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
 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:109
+#: plugins/addons/addressbook/contents.tpl:112
 msgid "Search string"
 msgstr "Suchtext"
 
@@ -5338,10 +5248,10 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: 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
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
 msgid "Dial"
 msgstr "Wähle"
 
@@ -5365,7 +5275,7 @@ msgid "Personal"
 msgstr "Persönlich"
 
 #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
 #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
 #: html/getxls.php:298
 msgid "Initials"
@@ -5395,26 +5305,26 @@ msgstr "Stadt"
 
 #: plugins/addons/addressbook/address_edit.tpl:191
 #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
 msgid "Country"
 msgstr "Land"
 
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
 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
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -5422,50 +5332,50 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
 #, php-format
 msgid "Removing of addressbook entry '%s' failed."
 msgstr "Entfernen von Adressbuch-Eintrag '%s' fehlgeschlagen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
 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:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
 #, 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:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
 #: plugins/addons/logview/class_logview.inc:112
 #: plugins/addons/logview/class_logview.inc:133
 #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5473,34 +5383,34 @@ msgstr "Erzeugen eines neuen Eintrags in"
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
 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:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
 msgid "Addressbook entry acls"
 msgstr "ACLs der Adressbuch-Einträge"
 
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
 #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
 msgid "Common name"
 msgstr "Name"
@@ -5702,12 +5612,12 @@ msgid "CSV import"
 msgstr "CSV-Import"
 
 #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
 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
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
 #, php-format
 msgid "You are not allowed to export the given ldap entry (%s)"
 msgstr "Sie haben keine Berechtigung diesen Eintrag zu exportieren (%s)"
@@ -5852,14 +5762,12 @@ msgstr ""
 "einzusehen."
 
 #: plugins/addons/logview/class_logview.inc:384
-#, fuzzy
 msgid "Log view"
-msgstr "Protokoll-Dienst"
+msgstr "Protokollanzeige"
 
 #: plugins/addons/logview/class_logview.inc:385
-#, fuzzy
 msgid "Log view addon"
-msgstr "Nach unten bewegen"
+msgstr "Protokollanzeige-Erweiterung"
 
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
@@ -5937,40 +5845,40 @@ msgstr "Fehler"
 msgid "Active"
 msgstr "Aktiv"
 
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
 msgid "Delete this message"
 msgstr "Diese Nachricht entfernen"
 
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
 msgid "unhold"
 msgstr "Vorhalten aufheben"
 
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
 msgid "Release message"
 msgstr "Nachricht freigeben"
 
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
 msgid "hold"
 msgstr "vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
 #: plugins/addons/mailqueue/class_mailqueue.inc:398
 msgid "Hold message"
 msgstr "Nachricht vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
 msgid "requeue"
 msgstr "wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
 msgid "Requeue this message"
 msgstr "Diese Nachricht wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
 msgid "header"
 msgstr "Kopfzeilen"
 
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
 msgid "Display header from this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
 
@@ -6067,9 +5975,8 @@ msgid "Delete message"
 msgstr "Entferne Nachricht"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:400
-#, fuzzy
 msgid "Requeue message"
-msgstr "Diese Nachricht wieder einreihen"
+msgstr "Nachricht wieder einreihen"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:401
 msgid "Gathering queue data"
@@ -6138,16 +6045,35 @@ msgstr "Keine DFS-Einträge gefunden"
 msgid "Go up one dfsshare"
 msgstr "Eine DFS-Freigabe nach oben"
 
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr "Auf"
+
 #: plugins/addons/godfs/class_dfsManagment.inc:214
 msgid "Go to dfs root"
 msgstr "Gehe zur DFS-Wurzel"
 
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Wurzel"
+
 #: plugins/addons/godfs/class_dfsManagment.inc:215
 msgid "Create new dfsshare"
 msgstr "Neue DFS-Freigabe erstellen"
 
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
 msgid "Finish"
 msgstr "Speichern"
 
@@ -6197,7 +6123,7 @@ msgstr "Meldungen"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
 #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
 msgid "Groups"
 msgstr "Gruppen"
@@ -6211,12 +6137,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
 msgstr "Es ist kein Eintrag 'NOTIFY_COMMAND' in ihrer gosa.conf definiert"
 
 #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
@@ -6227,9 +6153,8 @@ msgstr ""
 "Bitte geben Sie mindestens einen Empfänger an, um eine Nachricht zu senden!"
 
 #: plugins/addons/notifications/class_msgplug.inc:214
-#, fuzzy
 msgid "No DESC tag in message file:"
-msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
+msgstr "Kein DESC-Tag in der Nachrichten-Datei:"
 
 #: plugins/addons/notifications/contents.tpl:2
 msgid "Notification target"
@@ -6275,19 +6200,19 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
 #: 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:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
 #: 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:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
 msgid "Continue"
 msgstr "Fortsetzen"
 
@@ -6405,32 +6330,32 @@ msgstr ""
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
 msgid "! unknown id"
 msgstr "! unbekannte id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6438,30 +6363,23 @@ msgstr ""
 "Ihre Such-Methode ergab mehr als '%s' Benutzer, es werden davon '%s' "
 "Benutzer angezeigt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: 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:630
+#: 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:635
+#: 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:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: 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:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -6469,37 +6387,37 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
 msgid "Phone pickup group"
 msgstr "Gesprächs-Annahme Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
 msgid "Samba SID"
 msgstr "Samba SID"
 
@@ -6523,8 +6441,8 @@ msgstr "Kategorie hinzufügen"
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
 msgid "read"
 msgstr "lesen"
 
@@ -6540,8 +6458,8 @@ msgstr "extern posten"
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
 msgid "write"
 msgstr "schreiben"
 
@@ -6565,49 +6483,48 @@ msgstr "Sie versuchen, eine ungültige Mail-Adresse hinzuzufügen"
 msgid "to the list of forwarders."
 msgstr "zur Liste der Weiterleitungen hinzuzufügen."
 
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
 #, 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:854
+#: plugins/admin/groups/class_groupMail.inc:861
 #, 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:883
+#: plugins/admin/groups/class_groupMail.inc:890
 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:916
+#: plugins/admin/groups/class_groupMail.inc:923
 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:920
+#: plugins/admin/groups/class_groupMail.inc:927
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
-#: plugins/admin/groups/class_groupMail.inc:1067
-#, fuzzy
+#: plugins/admin/groups/class_groupMail.inc:1074
 msgid "Group mail"
-msgstr "Gruppenname"
+msgstr "Gruppenmail"
 
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
 msgid "Alternate addresses"
 msgstr "Weitere Adressen"
 
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
 msgid "Forwarding addresses"
 msgstr "Weiterleitungs-Adressen"
 
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
 #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -6676,7 +6593,9 @@ msgstr ""
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
 #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
@@ -6707,7 +6626,7 @@ msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
 #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
 msgid "department"
 msgstr "Abteilung"
 
@@ -6783,11 +6702,11 @@ msgid "Group applications"
 msgstr "Anwendungen der Gruppe"
 
 #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
@@ -6797,7 +6716,7 @@ msgstr "Anwendung"
 #: 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/systems/class_servRepository.inc:252
 #: plugins/admin/fai/faiPackage.tpl:37
 #: plugins/admin/fai/class_faiPackage.inc:542
 #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6887,58 +6806,58 @@ msgstr "Zeige Funktions-Gruppen"
 msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
 msgid "Posix"
 msgstr "Posix"
 
-#: 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:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: 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:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: 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:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
 msgid "copy"
 msgstr "Kopieren"
 
-#: 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:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: 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:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: 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:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
@@ -6987,7 +6906,7 @@ msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen!"
 #: plugins/admin/users/class_userManagement.inc:449
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "none"
 msgstr "keine"
 
@@ -7015,8 +6934,8 @@ 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:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
 msgid "Template"
 msgstr "Vorlage"
 
@@ -7096,109 +7015,109 @@ 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:133
+#: plugins/admin/users/class_divListUsers.inc:121
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Edit netatalk properties"
 msgstr "Netatalk-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
 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:278
+#: plugins/admin/users/class_divListUsers.inc:266
 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:297
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
 msgid "Offline"
 msgstr "inaktiv"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
 #: plugins/admin/applications/class_divListApplication.inc:51
 msgid "Application name"
 msgstr "Name der Anwendung"
 
 #: plugins/admin/applications/generic.tpl:15
 #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
 #: html/getxls.php:297
 msgid "Display name"
 msgstr "Angezeigter Name"
 
 #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
 #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
 #: plugins/admin/systems/goMailServer.tpl:215
 #: plugins/admin/systems/goImapServer.tpl:110
 #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7216,9 +7135,9 @@ msgid "Choose subtree to place application in"
 msgstr "Wählen Sie den Teilbaum, in den die Anwendung plaziert werden soll."
 
 #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
 #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
 msgid "Icon"
 msgstr "Symbol"
 
@@ -7231,41 +7150,45 @@ msgstr "Anwenden"
 msgid "Reload picture from LDAP"
 msgstr "Bild neu laden"
 
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+msgid "Remove picture from LDAP"
+msgstr "Entferne Bild aus LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
 msgid "Only executable for members"
 msgstr "Nur ausführbar für Gruppen-Mitglieder"
 
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
 msgid "Place icon on members desktop"
 msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
 msgid "Place entry in members launch bar"
 msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/fai/faiTemplateEntry.tpl:49
 msgid "Upload"
 msgstr "Hochladen"
 
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:308
 #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7294,7 +7217,7 @@ msgstr ""
 "Schaltfläche unten hinzufügen."
 
 #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
 msgid "Variable"
 msgstr "Variable"
 
@@ -7350,75 +7273,69 @@ msgstr "Anwendungsverwaltung"
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
 msgid "This 'dn' is no application."
 msgstr "Dieser 'DN' ist keine Anwendung."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
 #, php-format
 msgid "Removing of application with dn '%s' failed."
 msgstr "Entfernen der Anwendung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr "Entfernen der Anwendung von Objektgruppe '%s' fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Entfernen der Anwendung von der Gruppe '%s' ist fehlgeschlagen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
 msgid "Specified execute path must start with '/'."
 msgstr "Der angegebene Ausführungspfad muss zwingend mit '/' beginnen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Anwendung unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
 #, php-format
 msgid "Saving of application with dn '%s' failed."
 msgstr "Speichern der Anwendung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
 msgid "Application generic"
 msgstr "Anwendung (Allgemein)"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
 msgid "Flag"
 msgstr "Flag"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
 msgid "Script content"
 msgstr "Skript-Inhalt"
 
@@ -7450,13 +7367,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:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
 msgid "Create new application"
 msgstr "Neue Anwendungen erstellen"
 
@@ -7472,6 +7389,20 @@ msgstr "Zweige"
 msgid "Current release"
 msgstr "Momentanes Release"
 
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Gewünschte Operation wird durchgeführt"
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+"Ihr Browser unterstützt keine IFrames - bitte wählen Sie diesen Link, um die "
+"gewünschte Operation durchzuführen."
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Name der Abteilung"
@@ -7486,7 +7417,7 @@ msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
 #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
 msgid "Category"
 msgstr "Kategorie"
 
@@ -7519,12 +7450,12 @@ msgstr "Einleitende Telefonnummer dieses Teilbaums"
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Einleitende Fax-Nummer dieses Teilbaums"
 
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
 msgid "Administrative settings"
 msgstr "Administrative Einstellungen"
 
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
 msgid "Tag department as an independent administrative unit"
 msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
 
@@ -7561,55 +7492,25 @@ msgstr ""
 "haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
 "Vorgang abzubrechen."
 
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr "Gewünschte Operation wird durchgeführt"
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-"Sobald der Vorgang abgeschlossen wurde, können Sie zum unteren Ende der "
-"Seite blättern und auf den 'Weiter'-Knopf drücken, um zum Abteilungs-"
-"Verwaltungs-Dialog zurück zu gelangen."
-
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Ihr Browser unterstützt keine IFrames - bitte wählen Sie diesen Link, um die "
-"gewünschte Operation durchzuführen."
-
 #: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Entfernen der Abeilung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -7617,49 +7518,49 @@ msgstr ""
 "Das Feld 'Name' enthält das reservierte Wort '%s'. Bitte wählen Sie einen "
 "anderen Namen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 "Kritischer Fehler: Kann keine unbenutzte Marke finden, um die administrative "
 "Einheit zu kennzeichnen!"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Speichern der Abteilung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markiere '%s'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verschiebe '%s' nach '%s'"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: 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:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Objekt"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Fehler beim kopieren von %s, breche ab"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
 #: plugins/admin/systems/workstationService.tpl:89
 #: plugins/admin/systems/terminalService.tpl:79
 #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7668,24 +7569,25 @@ msgstr "Abteilungen"
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
 #: plugins/admin/departments/class_divListDepartment.inc:41
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
 #, 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:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
 msgid ".."
 msgstr ".."
 
@@ -7709,14 +7611,33 @@ msgid "Regular expression for matching department names"
 msgstr "Regulärer Ausdruck zum Erkennen von Abteilungs-Namen"
 
 #: 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:101
 msgid "Create new department"
 msgstr "Neue Abteilung erstellen"
 
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+msgid "You are currently moving/renaming this department."
+msgstr ""
+"Momentan sind Sie dabei, diese Abteilung zu verschieben bzw. neu zu benennen."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr "GOsa kann dies (noch) NICHT für Sie reparieren."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+"Bevor Sie diese Aktion bestätigen, stellen Sie sicher, dass alles wie "
+"erwartet sein wird, vielleicht ist die beste Lösung, vorher ein Backup zu "
+"erstellen."
+
 #: plugins/admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Netzwerk-Einstellungen"
@@ -7738,7 +7659,7 @@ msgid "Enable DNS for this device"
 msgstr "DNS für dieses Gerät aktivieren"
 
 #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7751,8 +7672,8 @@ 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:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7767,10 +7688,10 @@ msgid "present"
 msgstr "vorhanden"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: 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:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
@@ -7807,6 +7728,95 @@ msgstr "läuft nicht"
 msgid "offline"
 msgstr "inaktiv"
 
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Terminal-Vorlage"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+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:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr "Modus"
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr "Wählen Sie den Terminal-Modus"
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+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:549
+msgid "Root server"
+msgstr "Root-Server"
+
+#: plugins/admin/systems/terminal.tpl:69
+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:550
+msgid "Swap server"
+msgstr "Auslagerungs-Server"
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
+"werden sollen"
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr "Zeit-Server-Attribute übernehmen"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Zeit-Server"
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Aktion"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
+
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr "System-Information"
@@ -7913,50 +7923,49 @@ msgstr "GUI"
 msgid "This 'dn' has no network features."
 msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
 #, php-format
 msgid "Removing of system wingeneric/generic with dn '%s' failed."
 msgstr "Entfernen von System WinGeneric/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 "Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
 
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
 #, php-format
 msgid "Saving of system wingeneric/generic with dn '%s' failed."
 msgstr "Speichern von System Windows/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
 msgid "Win generic"
 msgstr "Windows (Allgemein)"
 
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
 msgid "Windows workstation generic"
 msgstr "Windows-Arbeitsstation (Allgemein)"
 
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
 msgid "Win workstation"
 msgstr "Windows Arbeitsstation"
 
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
 #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
@@ -7964,125 +7973,20 @@ msgstr "Name der Arbeitsstation"
 msgid "System management"
 msgstr "Systemverwaltung"
 
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Terminal-Vorlage"
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-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:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr "Modus"
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr "Wählen Sie den Terminal-Modus"
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr "Protokoll-Server"
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-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:509
-msgid "Root server"
-msgstr "Root-Server"
-
-#: plugins/admin/systems/terminal.tpl:69
-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:510
-msgid "Swap server"
-msgstr "Auslagerungs-Server"
-
-#: plugins/admin/systems/terminal.tpl:79
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
-"werden sollen"
-
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr "Zeit-Server-Attribute übernehmen"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
 msgstr "Zeit-Server"
 
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Aktion"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr "unbekannt"
-
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
 #: plugins/admin/systems/class_terminalStartup.inc:39
 #: plugins/admin/systems/class_terminalStartup.inc:121
 #: plugins/admin/systems/class_terminalStartup.inc:141
-#: 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: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_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
 #: plugins/admin/systems/class_workstationService.inc:201
 #: plugins/admin/systems/class_workstationService.inc:204
 #: plugins/admin/systems/class_workstationService.inc:207
@@ -8097,193 +8001,25 @@ msgstr "unbekannt"
 #: plugins/admin/systems/class_workstationService.inc:233
 #: plugins/admin/systems/class_workstationService.inc:234
 #: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
 msgid "inherited"
 msgstr "geerbt"
 
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "Bit"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "Standard"
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "zeige Auswahl"
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "direkt"
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "lastverteilt"
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Citrix Metaframe"
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr ""
-"Speichern von Objekt System Terminal/Dienst mit dn '%s' fehlgeschlagen."
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-msgid "Service"
-msgstr "Dienst"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Terminal-Dienst"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-msgid "Monitor"
-msgstr "Monitor"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-msgid "Method"
-msgstr "Methode"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Entfernte Arbeitsfläche"
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr "Schrift-Suchpfad"
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-msgid "Gfx driver"
-msgstr "Grafiktreiber"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-msgid "Gfx resolution"
-msgstr "Auflösung"
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-msgid "Gfx color depth"
-msgstr "Farbtiefe"
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-msgid "Hsync"
-msgstr "HSync"
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-msgid "Vsync"
-msgstr "VSync"
-
-#: plugins/admin/systems/class_terminalService.inc:448
-msgid "Printer service enabled"
-msgstr "Druck-Dienst aktiviert"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Spool-Server"
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-msgid "Scanner enabled"
-msgstr "Scanner aktiviert"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-msgid "Scanner model"
-msgstr "Scanner-Modell"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-msgid "Keyboard model"
-msgstr "Tastatur-Modell"
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-msgid "Keyboard layout"
-msgstr "Tastatur-Layout"
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-msgid "Keyboard variant"
-msgstr "Tastatur-Variante"
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-msgid "Mouse type"
-msgstr "Maus-Typ"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-msgid "Mouse port"
-msgstr "Maus-Anschluß"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Telefon-Hardware"
-
 #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8302,24 +8038,24 @@ msgid "Terminal startup"
 msgstr "Terminal-Start"
 
 #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
 msgid "Ldap server"
 msgstr "LDAP-Server"
 
 #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
 msgid "Kernel modules"
 msgstr "Kernel-Module"
 
 #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
 #: 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:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
 msgid "Kernel parameter"
 msgstr "Kernel-Parameter"
 
@@ -8327,7 +8063,7 @@ msgstr "Kernel-Parameter"
 msgid "Server name"
 msgstr "Server-Name"
 
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
@@ -8414,7 +8150,7 @@ msgid "Supported interfaces"
 msgstr "Unterstützte Schnittstellen"
 
 #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
 msgid "Serial"
 msgstr "Seriell"
 
@@ -8454,90 +8190,84 @@ msgstr "Anhänge"
 msgid "Installed cartridges"
 msgstr "Installierte Patronen"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
 msgid "text"
 msgstr "textuell"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
 #, php-format
 msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 "Speichern von System Terminal/Allgemein (FAIstate) mit dn '%s' "
 "fehlgeschlagen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Es ist kein REBOOTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
 msgid "Memory test"
 msgstr "Speichertest"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
 msgid "System analysis"
 msgstr "Systemanalyse"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
 #, php-format
 msgid "Removing of object system terminal/generic with dn '%s' failed."
 msgstr "Entfernen von System Terminal/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_terminalGeneric.inc:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
@@ -8545,114 +8275,113 @@ msgstr ""
 "Es muss mindestens ein NTP-Server ausgewählt sein, wenn der Übernahme-Modus "
 "nicht aktiv ist."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
 #, 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:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
 msgid "Terminal generic"
 msgstr "Terminal (Allgemein)"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
 msgid "Syslog server enabled"
 msgstr "Protokoll-Server aktiviert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
 msgid "Ntp server settings"
 msgstr "NTP-Dienst-Einstellungen"
 
-#: 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:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+msgid "Root password"
+msgstr "Root-Passwort"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
 msgid "Activated"
 msgstr "Aktiv"
 
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
 #, php-format
 msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 "Speichern von System Server/Allgemein (FAIstate) mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
 msgid "Instant update"
 msgstr "Sofortiges Update"
 
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
 msgid "Scheduled update"
 msgstr "Geplantes Update"
 
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
 msgid "Reinstall"
 msgstr "Neu-Installation"
 
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
 msgid "Rescan hardware"
 msgstr "Hardware neu erkennen"
 
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
 #, php-format
 msgid "Removing of system server/generic with dn '%s' failed."
 msgstr "Entfernen von System Server/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
 msgid "The required field 'Server name' is not set."
 msgstr "Das benötigte Feld 'Server-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servGeneric.inc:250
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
 #, php-format
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr "Speichern von System Server/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
 msgid "Server generic"
 msgstr "Server (Allgemein)"
 
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
@@ -8680,56 +8409,49 @@ msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten DHCP-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
 #, php-format
 msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 "Speichern von System Arbeitsstation/Allgemein (FAIstate) mit dn '%s' "
 "fehlgeschlagen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
 #, php-format
 msgid "Removing of system workstation/generic with dn '%s' failed."
 msgstr ""
 "Entfernen von System Arbeitsstation/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
 msgid "The required field 'Workstation name' is not set."
 msgstr "Das benötigte Feld 'Arbeitsstationsname' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
 #, php-format
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr ""
 "Speichern von System Arbeitsstation/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
 msgid "Workstation generic"
 msgstr "Arbeitsstation (Allgemein)"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
 msgid "Ntp server"
 msgstr "NTP-Dienst"
 
@@ -8737,97 +8459,118 @@ msgstr "NTP-Dienst"
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+"Erstellen des Abbilds fehlgeschlagen. Bitte überprüfen Sie den Fehlerbericht "
+"unterhalb."
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"Das Kommando '%s', angegeben für die ISO-Erstellung, scheint nicht zu "
+"existieren."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+msgid "You are not allowed to create a new object of this type."
+msgstr "Es ist Ihnen nicht erlaubt, ein neues Objekt dieses Typs zu erstellen."
+
+#: plugins/admin/systems/class_systemManagement.inc:308
 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:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+msgid "You are not allowed to change the password for this object."
+msgstr "Sie haben keine Berechtigung, das Passwort dieses Objektes zu ändern."
+
+#: plugins/admin/systems/class_systemManagement.inc:348
 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: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:405
+msgid "Can't detect object to change password."
+msgstr "Kann Objekt nicht erkennen, um das Passwort zu ändern."
 
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
 #, 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:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
 #: 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:652
+#: plugins/admin/systems/class_systemManagement.inc:837
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
 msgid "Workstation is installing"
 msgstr "Arbeitsstation installiert gerade"
 
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
 msgid "Workstation is waiting for action"
 msgstr "Arbeitsstation wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
 msgid "Workstation installation failed"
 msgstr "Installation der Arbeitsstation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
 msgid "Server is installing"
 msgstr "Server wird installiert"
 
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
 msgid "Server is waiting for action"
 msgstr "Server wartet auf Aktion"
 
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
 msgid "Server installation failed"
 msgstr "Server-Installation ist fehlgeschlagen"
 
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
@@ -8936,9 +8679,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
 
 #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
 msgid "DNS service"
 msgstr "DNS-Dienst"
 
@@ -8969,7 +8712,7 @@ msgstr ""
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
 #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
 msgid "Reverse zone"
 msgstr "Reverse Zone"
 
@@ -8978,7 +8721,7 @@ msgstr "Reverse Zone"
 msgid "Class"
 msgstr "Klasse"
 
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
@@ -8987,38 +8730,38 @@ msgstr ""
 "Sie können die gewählte Zone nicht entfernen, sie wird noch von folgendem(n) "
 "Eintrag / Einträgen verwendet: '%s'"
 
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
 #, php-format
 msgid "Updating of system server/dns with dn '%s' failed."
 msgstr "Aktualisieren des Systems Server/DNS mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
 #, php-format
 msgid "Removing of system server/dns with dn '%s' failed."
 msgstr "Entfernen von System Server/DNS mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
 #, php-format
 msgid "Saving of system server/dns with dn '%s' failed."
 msgstr "Speichern von System Server/DNS mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
 #, php-format
 msgid "Set status flag for system server/dns with dn '%s' failed."
 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:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
 msgid "Primary dns server"
 msgstr "Primärer DNS-Server"
 
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
 #: plugins/admin/systems/servdnseditzone.tpl:73
 #: plugins/admin/ogroups/phonequeue.tpl:70
 #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9026,12 +8769,12 @@ msgstr "Primärer DNS-Server"
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
 #: plugins/admin/systems/servdnseditzone.tpl:79
 msgid "Expire"
 msgstr "Ablauf"
 
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
 #: plugins/admin/systems/servdnseditzone.tpl:24
 msgid "Zone records"
 msgstr "Zonen-Einträge"
@@ -9219,48 +8962,49 @@ msgstr "HTTP Frei/Belegt-Dienst"
 
 #: plugins/admin/systems/class_servKolab.inc:392
 msgid "Allow unauthenticated free busy"
-msgstr "Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
+msgstr ""
+"Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
 
 #: plugins/admin/systems/class_servKolab.inc:395
 msgid "kolabFreeBusyFuture"
 msgstr "Kolab Frei/Belegt Ausblick"
 
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 "Kann keine gültige Basis aus der Objekt-DN auslesen, setze Basis auf '%s'."
 
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 "Konnte den 'Druck'-Reiter nicht erstellen, der Parameter 'parent' fehlt"
 
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 "Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
 
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
 msgid "This is a terminal template, printer tab is disabled."
 msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
 
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid "This 'dn' has no printer features."
 msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -9271,12 +9015,12 @@ msgstr ""
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -9284,7 +9028,7 @@ msgstr ""
 "Diese Workstation besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -9292,7 +9036,7 @@ msgstr ""
 "Dieses Terminal besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -9300,7 +9044,7 @@ msgstr ""
 "Aktuell besitzt diese Workstation keine aktivierte Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -9308,60 +9052,59 @@ msgstr ""
 "Aktuell besitzt dieses Terminal keine aktivierten Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
 msgid "can't get ppd informations."
 msgstr "keine PPD-Informationen verfügbar"
 
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
 
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
 "möglich."
 
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
 #, php-format
 msgid "Removing of system print/generic with dn '%s' failed."
 msgstr "Entfernen von System Drucker/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
 #, php-format
 msgid "Saving of system print/generic with dn '%s' failed."
 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:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
 #: plugins/admin/fai/faiTemplateEntry.tpl:85
 #: plugins/admin/fai/faiTemplateEntry.tpl:127
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/admin/systems/class_printGeneric.inc:855
-#, fuzzy
+#: plugins/admin/systems/class_printGeneric.inc:859
 msgid "Print generic"
-msgstr "Druck-Dienst"
+msgstr "Drucken (Alllgemein)"
 
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
 msgid "LabeledURL"
 msgstr "Benannte URL"
 
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
 msgid "Printer PPD"
 msgstr "Drucker-PPD"
 
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
 #, php-format
 msgid ""
 "You are not allowed to remove the given object '%s' from the list of members "
@@ -9370,14 +9113,14 @@ msgstr ""
 "Sie haben keine Berechtigung, das gewählte Objekt '%s' von der "
 "Mitgliedsliste des Druckers '%s' zu entfernen."
 
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 "Ungültiger Drucker während des Hinzufügens von '%s' zu der Liste von '%s' "
 "Druckern."
 
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
 #, php-format
 msgid ""
 "You are not allowed to add the given object '%s' to the list of members of '%"
@@ -9386,14 +9129,14 @@ msgstr ""
 "Ihnen ist es nicht erlaubt das gewählte Objekt '%s' zu der Mitgliedsliste "
 "von '%s' hinzuzufügen."
 
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 "Kann '%s' nicht zur Liste der Mitglieder hinzufügen, er wird bereits "
 "verwendet."
 
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -9420,41 +9163,37 @@ msgid "Changing the password impinges on authentification only."
 msgstr ""
 "Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
 
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
 #, php-format
 msgid "Removing of system component/generic with dn '%s' failed."
 msgstr "Entfernen von System Komponente/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
 msgid "The required field 'Component name' is not set."
 msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
 msgid "The required field IP address is empty."
 msgstr "Das benötigte Feld 'IP-Adresse' ist leer."
 
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
 msgid "The field IP address contains an invalid address."
 msgstr "Das Feld 'IP-Adresse' enthält eine ungültige Adresse."
 
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
 #, php-format
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr "Speichern von System Komponente/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
 msgid "Component generic"
 msgstr "Netzwerk-Komponente (Allgemein)"
 
-#: plugins/admin/systems/class_componentGeneric.inc:263
-msgid "Network device"
-msgstr "Netzwerk-Gerät"
-
-#: plugins/admin/systems/goNtpServer.tpl:2
-msgid "Time server"
-msgstr "Zeit-Server"
+#: plugins/admin/systems/class_componentGeneric.inc:265
+msgid "Network device"
+msgstr "Netzwerk-Gerät"
 
 #: plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
@@ -9470,6 +9209,22 @@ msgstr "Kerberos Realm"
 msgid "Admin user"
 msgstr "Administrator"
 
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr "Informationen der VoIP-Datenbank"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Asterisk-DB Benutzer"
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "Landesvorwahl"
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr "Ortsvorwahl"
+
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr "Wählen Sie die Art der System-Komponente, die Sie anlegen möchten"
@@ -9544,21 +9299,13 @@ msgstr "Codepage"
 msgid "Option"
 msgstr "Option"
 
-#: plugins/admin/systems/goFonServer.tpl:1
-msgid "VoIP database information"
-msgstr "Informationen der VoIP-Datenbank"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Asterisk-DB Benutzer"
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "Landesvorwahl"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Informationen der Fax-Datenbank"
 
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "Ortsvorwahl"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr "Fax-DB Benutzer"
 
 #: plugins/admin/systems/remove_glpi.tpl:10
 msgid ""
@@ -9576,12 +9323,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:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
 msgid "yes"
 msgstr "ja"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
 msgid "no"
 msgstr "nein"
 
@@ -9607,97 +9354,87 @@ msgstr ""
 msgid "Removing of system phone/generic with dn '%s' failed."
 msgstr "Entfernen von System Telefon/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
 msgid "The required field 'Phone name' is not set."
 msgstr "Das benötigte Feld 'Telefon-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
 #, php-format
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr "Speichern von System Telefon/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
 msgid "Phone generic"
 msgstr "Telefon (Allgemein)"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
 msgid "SIP Mode"
 msgstr "SIP Modus"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
 msgid "SIP DTMF mode"
 msgstr "SIP DTMF-Modus"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
 msgid "SIP Default ip"
 msgstr "SIP Standard IP-Adresse"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
 msgid "SIP Qualify"
 msgstr "SIP Qualifizieren"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:440
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:446
 msgid "IAX authentication type"
-msgstr "Nagios Authentifikation"
+msgstr "IAX Authentifikations-Typ"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:441
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:447
 msgid "IAX secret"
-msgstr "Fax-Dienst"
+msgstr "IAX Kennwort"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:442
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:448
 msgid "IAX account code"
-msgstr "Konto-Identifikation"
+msgstr "IAX Konto-Identifikation"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:443
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:449
 msgid "IAX trunk lines"
-msgstr "Leitungen zusammenfassen"
+msgstr "IAX Leitungen zusammenfassen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:444
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:450
 msgid "IAX permit settings"
-msgstr "Fax-Einstellungen"
+msgstr "IAX Zulassungs-Einstellungen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:445
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:451
 msgid "IAX deny settings"
-msgstr "Fax-Einstellungen"
+msgstr "IAX Ablehnungs-Einstellungen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
 msgid "Hardware type"
 msgstr "Hardware-Typ"
 
 #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
 msgstr ""
-"Die Datei '/etc/gosa/encodings' wurde nicht gefunden, kann die unterstützten "
+"Die Datei '%s/encodings' wurde nicht gefunden, kann die unterstützten "
 "Zeichensätze nicht einlesen."
 
 #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Kann '/etc/gosa/encodings' nicht lesen, bitte prüfen Sie die Rechte."
+#, php-format
+msgid "Can't read '%s/encodings', please check permissions."
+msgstr "Kann '%s/encodings' nicht lesen, bitte prüfen Sie die Rechte."
 
 #: plugins/admin/systems/class_servNfs.inc:178
 msgid "Please specify a valid path for your setup."
@@ -9727,7 +9464,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:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
@@ -9736,12 +9473,12 @@ msgstr ""
 "momentanen Einstellungen für Server und Release nicht aufgelöst werden "
 "können."
 
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
 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:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9749,11 +9486,11 @@ msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
 msgid "Not available in current setup"
 msgstr "Nicht verfügbar in momentaner Konfiguration"
 
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9762,7 +9499,7 @@ 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:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9773,19 +9510,19 @@ msgstr ""
 "Ihre FAI-Konfigurationen (wahrscheinlich wurden einige Klassen entfernt oder "
 "umbenannt). Der Server wurde auf 'auto' zurückgesetzt."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
 #, 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:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
 #, 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:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
 #: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
@@ -9795,25 +9532,25 @@ msgstr ""
 "Das als REPOSITORY_HOOK '%s' angegebene Kommando lieferte eine leere "
 "Zeichenkette."
 
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
 msgid "System startup"
 msgstr "Systemstart"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
 #: 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:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
 msgid "Debian mirror"
 msgstr "Debian Spiegelserver"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
 msgid "Debian release"
 msgstr "Debian-Release"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
 msgid "FAI status flag"
 msgstr "FAI-Status-Flag"
 
@@ -9987,13 +9724,13 @@ msgstr "Section"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:462
 #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
 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
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
 msgid "False"
 msgstr "falsch"
 
@@ -10002,7 +9739,27 @@ msgstr "falsch"
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Entfernen der alten PPD-Datei '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+"Entfernen der alten PPD-Datei '%s' fehlgeschlagen. Auf die Datei kann nicht "
+"zugegriffen werden."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+"Entfernen der alten PPD-Datei '%s' fehlgeschlagen. Datei existiert nicht "
+"oder ist nicht erreichbar."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
@@ -10017,7 +9774,7 @@ msgstr "Drucker-Treiber"
 #: plugins/admin/systems/printerPPDDialog.tpl:5
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
 #: plugins/admin/systems/class_glpiAccount.inc:784
 msgid "Model"
 msgstr "Modell"
@@ -10052,29 +9809,187 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Sind sind dabei, die PPD-Datei '%s' aus '%s' zu löschen."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Die angegebene PPD-Datei '%s' wurde nicht gefunden."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+"Etwas schlug fehl während des Versuchs, die PPD-Datei vom Server zu "
+"entfernen, vielleicht haben wir keinen Schreibzugriff."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
 #, php-format
 msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 "Der ausgewählte Hersteller '%s' existiert nicht in der Liste der PPD's."
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
 msgid "Printer ppd selection."
 msgstr "Auswahl der Drucker-PPD"
 
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr "unbekannt"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "zeige Auswahl"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "direkt"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "lastverteilt"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "Citrix Metaframe"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
+
 #: plugins/admin/systems/class_workstationService.inc:443
 #, php-format
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Speichern von System Arbeitsstation/Dienst mit dn '%s' fehlgeschlagen."
 
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+msgid "Service"
+msgstr "Dienst"
+
 #: plugins/admin/systems/class_workstationService.inc:452
 msgid "Workstation service"
 msgstr "Arbeitsstations-Dienst"
 
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+msgid "Monitor"
+msgstr "Monitor"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+msgid "Gfx driver"
+msgstr "Grafiktreiber"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+msgid "Gfx resolution"
+msgstr "Auflösung"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+msgid "Gfx color depth"
+msgstr "Farbtiefe"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+msgid "Vsync"
+msgstr "VSync"
+
 #: plugins/admin/systems/class_workstationService.inc:466
 msgid "Use DDC"
 msgstr "Verwende DDC"
 
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+msgid "Scanner enabled"
+msgstr "Scanner aktiviert"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+msgid "Keyboard model"
+msgstr "Tastatur-Modell"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+msgid "Keyboard layout"
+msgstr "Tastatur-Layout"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+msgid "Keyboard variant"
+msgstr "Tastatur-Variante"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+msgid "Mouse type"
+msgstr "Maus-Typ"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+msgid "Mouse port"
+msgstr "Maus-Anschluß"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Telefon-Hardware"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -10152,41 +10067,42 @@ msgid "Display device"
 msgstr "Anzeige"
 
 #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
 msgid "Use DDC for automatic detection"
 msgstr "Verwende DDC zur automatischen Erkennung"
 
 #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
 msgid "HSync"
 msgstr "HSync"
 
 #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr "Horizontale Wiederholrate für den installierten Monitor"
 
 #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
 msgid "VSync"
 msgstr "VSync"
 
 #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
 msgid "Vertical refresh frequency for installed monitor"
 msgstr "Vertikale Wiederholrate für den installierten Monitor"
 
 #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
 msgid "Scan device"
 msgstr "Scanner"
 
 #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
 msgid "Select to start SANE scan service on terminal"
 msgstr "Wählen, um den SANE Scanner-Dienst auf dem Terminal zu starten"
 
 #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
 msgid "Provide scan services"
 msgstr "Bilderfassungsdienste bereitstellen"
 
@@ -10228,18 +10144,18 @@ msgstr "Zugewiesene FAI-Klassen"
 msgid "set"
 msgstr "setzen"
 
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
 #: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Kernel modules (format: name parameters)"
 msgstr "Kernel-Module (Format: Name Parameter)"
 
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/terminalStartup.tpl:69
 msgid "Add additional modules to load on startup"
 msgstr ""
 "Zusätzliche Module hinzufügen, die während des Starts geladen werden sollen"
 
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
 #: plugins/admin/systems/terminalStartup.tpl:105
 msgid "Mountpoint"
 msgstr "Mount-Pfad"
@@ -10270,66 +10186,76 @@ msgstr "Wählen, um ausführlichere Informationen während des Starts zu erhalte
 msgid "use debug mode for startup"
 msgstr "benutze Fehlersuch-Modus für Systemstart"
 
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Entfernte Arbeitsfläche"
+
+#: plugins/admin/systems/terminalService.tpl:177
 msgid "Connect method"
 msgstr "Verbindungsmethode"
 
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
 msgid "Choose method to connect to terminal server"
 msgstr "Wählen Sie die Methode der Anbindung an den Terminal-Server"
 
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
 msgid "Terminal server"
 msgstr "Terminal-Server"
 
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
 msgid "Select specific terminal server to use"
 msgstr "Wählen Sie einen bestimmten Terminal-Server"
 
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
 msgid "Font server"
 msgstr "Schriften-Server"
 
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
 msgid "Select specific font server to use"
 msgstr "Wählen Sie einen bestimmten Schriften-Server"
 
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
 msgid "Print device"
 msgstr "Drucker"
 
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
 msgid "Select to start IPP based printing service on terminal"
 msgstr "Auswählen, um auf dem Terminal IPP-basierte Druckdienste zu starten"
 
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
 msgid "Provide print services"
 msgstr "Druckdienste bereitstellen"
 
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Spool-Server"
+
+#: plugins/admin/systems/terminalService.tpl:232
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 "Wählen Sie das NFS-Dateisystem, in dem die Spool-Dateien abgelegt werden"
 
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
 msgid "Select scanner driver to use"
 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/systems/class_servRepository.inc:365
 #: plugins/admin/fai/faiPackage.tpl:33
 msgid "Repository"
 msgstr "Repository"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
 msgid "Parent server"
 msgstr "Parent-Server"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
 msgid "Sections"
 msgstr "Sections"
 
@@ -10347,13 +10273,18 @@ 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_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
 msgid "Repository service"
 msgstr "Repository-Dienst"
 
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr "Sie können diese Erweiterung erst verwenden, wenn FAI aktiviert wurde."
+
+#: plugins/admin/systems/class_servRepository.inc:152
 #, php-format
 msgid ""
 "You can't delete this release, it is still used by these workstations [%s]. "
@@ -10363,7 +10294,7 @@ msgstr ""
 "Arbeitsstationen verwendet wird [%s]. Bitte lösen Sie zunächst diese "
 "Abhängigkeiten, um die Konsistenz der Datenbank zu gewährleisten."
 
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
 #, php-format
 msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
@@ -10371,13 +10302,13 @@ msgstr ""
 "Seien Sie vorsichtig, wenn Sie dieses Release editieren - es wird momentan "
 "noch von folgenden Arbeitsstationen verwendet [%s]."
 
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
 #: plugins/admin/fai/class_faiManagement.inc:343
 msgid "This name is already in use."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
 #: plugins/admin/systems/class_goGlpiServer.inc:92
 #: plugins/admin/systems/class_goCupsServer.inc:71
 #: plugins/admin/systems/class_serverService.inc:8
@@ -10388,7 +10319,7 @@ msgstr "Der angegebene Name wird bereits verwendet."
 msgid "Start"
 msgstr "Start"
 
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
 #: plugins/admin/systems/class_goGlpiServer.inc:93
 #: plugins/admin/systems/class_goCupsServer.inc:72
 #: plugins/admin/systems/class_serverService.inc:7
@@ -10400,7 +10331,7 @@ msgstr "Start"
 msgid "Stop"
 msgstr "Beenden"
 
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
 #: plugins/admin/systems/class_goGlpiServer.inc:94
 #: plugins/admin/systems/class_goCupsServer.inc:73
 #: plugins/admin/systems/class_serverService.inc:9
@@ -10411,11 +10342,11 @@ msgstr "Beenden"
 msgid "Restart"
 msgstr "Neustart"
 
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
 msgid "Releases"
 msgstr "Releases"
 
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
 msgid "Url"
 msgstr "URL"
 
@@ -10508,13 +10439,11 @@ msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
 msgid "Use"
 msgstr "Benutzen"
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Informationen der Fax-Datenbank"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr "Fax-DB Benutzer"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
+"Die PPD-Datei wird vom Server entfernt und kann nicht wiederhergestellt "
+"werden."
 
 #: plugins/admin/systems/class_glpiAccount.inc:147
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -10652,7 +10581,7 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
 msgid "File"
 msgstr "Datei"
 
@@ -10668,6 +10597,37 @@ msgstr "MIME-Typ"
 msgid "use"
 msgstr "verwenden"
 
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Gehe zur Wurzel-Abteilung"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Eine Abteilung nach oben"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Gehe zur Abteilung des Benutzers"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Heimat"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr "Liste neu laden"
+
 #: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
 "This dialog allows you to select a user as technical responsible person."
@@ -10809,7 +10769,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:532
+#: plugins/admin/systems/class_termDNS.inc:537
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -10891,7 +10851,7 @@ msgid "New processor"
 msgstr "Neuer Prozessor"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "P"
 msgstr "P"
 
@@ -11026,9 +10986,10 @@ msgid "Upload wasn't successfull."
 msgstr "Upload war nicht erfolgreich."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
-"Das Verzeichnis /etc/gosa/glpi/ zum Speichern von GLPI-Uploads wurde nicht "
+"Das Verzeichnis '%s/glpi/' zum Speichern von GLPI-Uploads wurde nicht "
 "gefunden."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -11190,26 +11151,26 @@ msgstr ""
 msgid "Cartridges"
 msgstr "Patronen"
 
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 "Kann das als AUTO_NETWORK_HOOK angegebene Kommando '%s' nicht ausführen."
 
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid "The required field 'IP-address' is not set."
 msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
 msgid "Wrong IP format in field IP-address."
 msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
 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:331
+#: plugins/admin/systems/class_termDNS.inc:333
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
@@ -11217,18 +11178,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:351
+#: plugins/admin/systems/class_termDNS.inc:353
 #, 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:359
+#: plugins/admin/systems/class_termDNS.inc:361
 #, 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:370
+#: plugins/admin/systems/class_termDNS.inc:372
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -11237,30 +11198,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:377
+#: plugins/admin/systems/class_termDNS.inc:379
 #: 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:460
+#: plugins/admin/systems/class_termDNS.inc:463
 #, 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:522
+#: plugins/admin/systems/class_termDNS.inc:527
 msgid "DNS"
 msgstr "DNS"
 
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
 msgid "DNS settings"
 msgstr "DNS-Einstellungen"
 
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
 msgid "DNS records"
 msgstr "DNS-Einträge"
 
@@ -11365,7 +11326,7 @@ msgstr "Objektgruppe wählen"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
 msgid "Down"
 msgstr "Ab"
 
@@ -11459,46 +11420,41 @@ msgstr ""
 "Kann '%s' nicht in '%s' umbenennen, da bereits ein Eintrag mit dem gleichen "
 "Namen im Zonen-Bearbeitungs-Dialog existiert."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr "Der Eintragsname '%s' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 "Kann '%s' nicht in '%s' umbenennen, der angegebene Name wird bereits "
 "verwendet."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr "Kann '%s' nicht anlegen, der angegebene Name wird bereits verwendet."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr "Der Name '%s' wird mehr als ein Mal verwendet."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr "Der Hostname '%s' sollte in Kleinbuchstaben geschrieben werden."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 "Der Eintrags-Typ '%s' ist ein einmaliger Typ und kann nicht mehrfach "
 "definiert werden."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr "Für '%s' wurde ein leerer '%s' gefunden."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr "Es wurde in '%s' ein doppelter Eintrag für '%s' gefunden."
@@ -11611,93 +11567,89 @@ msgstr "Zeige Netzwerk-Geräte"
 msgid "Display systems of user"
 msgstr "Zeige Systeme des Benutzers"
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
 msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
 msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
 msgid "Fax Server"
 msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
 msgid "Set root       password"
 msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
 msgid "Create CD"
 msgstr "Erstelle CD"
 
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
 msgid "Create FAI CD"
 msgstr "Erstelle FAI-CD"
 
@@ -11726,6 +11678,10 @@ msgstr "Alle verfügbaren Dienste werden bereits verwendet."
 msgid "Cups"
 msgstr "CUPS"
 
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr "Ihr Browser unterstützt keine iframes."
+
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:28
 msgid "LDAP service"
@@ -11810,6 +11766,15 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+msgid "Terminal service"
+msgstr "Terminal-Dienst"
+
 #: plugins/admin/systems/class_goTerminalServer.inc:78
 #, php-format
 msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11825,6 +11790,12 @@ msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 msgid "Temporary disable login"
 msgstr "Anmeldung sperren (temporär)"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr "Schrift-Suchpfad"
+
 #: plugins/admin/systems/class_serverService.inc:288
 msgid "Can't set status while this server is not saved."
 msgstr ""
@@ -12522,6 +12493,41 @@ msgstr ""
 "Das als ACTION_HOOK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "Standard"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr ""
+"Speichern von Objekt System Terminal/Dienst mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+msgid "Method"
+msgstr "Methode"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr "Auto-Sync"
+
+#: plugins/admin/systems/class_terminalService.inc:485
+msgid "Printer service enabled"
+msgstr "Druck-Dienst aktiviert"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+msgid "Scanner model"
+msgstr "Scanner-Modell"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr "..."
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -12545,8 +12551,8 @@ msgstr "Zusammengefasste Objekte"
 msgid "Phone queue"
 msgstr "Warteschlange"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
 msgid "System"
 msgstr "System"
 
@@ -12554,22 +12560,28 @@ msgstr "System"
 msgid "Terminals"
 msgstr "Arbeitsplätze"
 
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
+"anzulegen."
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
 msgid "There must be at least one NTP server selected."
 msgstr "Es muss mindestens ein NTP-Server ausgewählt sein."
 
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
 #, php-format
 msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
 msgstr ""
 "Setzen von Ablaufstatus (FAIstate) fehlgeschlagen für Objekt '%s'; der Wert "
 "war '%s'."
 
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
 msgid "Saving workstation failed"
 msgstr "Speichern der Arbeitsstation ist fehlgeschlagen"
 
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
 msgid "System group"
 msgstr "System-Gruppe"
 
@@ -12630,18 +12642,18 @@ msgid "Display objects of department"
 msgstr "Zeige die Objekte der Abteilung"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "You are not allowed to delete this object group!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
@@ -12649,78 +12661,78 @@ msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 msgid "This 'dn' is no object group."
 msgstr "Diese 'dn' ist keine Objektgruppenerweiterungen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
 msgid "and"
 msgstr "und"
 
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "Non existing dn:"
 msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
 msgid "There is already an object with this cn."
 msgstr "Diese cn ist bereits vergeben."
 
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
 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:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
 #, 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:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
 #, 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:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
 msgid "Member"
 msgstr "Mitglied"
 
@@ -12974,7 +12986,7 @@ msgstr ""
 "nicht gespeichert werden."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12988,9 +13000,9 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
@@ -13006,8 +13018,8 @@ msgstr "Kann Datenbank '%s' auf Server '%s' nicht löschen."
 #: plugins/admin/ogroups/class_phonequeue.inc:537
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
@@ -13022,8 +13034,8 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13177,15 +13189,15 @@ msgstr "Zeige Gruppen die Telefone enthalten"
 msgid "Show groups containing phones"
 msgstr "Zeige Gruppen mit Telefonen"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
 msgid "Create new object group"
 msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
 msgid "You are not allowed to remove this entry."
 msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Objektgruppe"
@@ -13198,16 +13210,29 @@ msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
 msgid "ACLs"
 msgstr "ACLs"
 
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+msgid "You are not allowed to edit this acl."
+msgstr "Sie sind nicht berechtigt, diese ACL zu bearbeiten."
+
+#: plugins/admin/acl/class_aclManagement.inc:167
 #, php-format
 msgid "You're about to delete the acl %s."
 msgstr "Sie sind dabei die ACL %s zu löschen."
 
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
 msgid "You are not allowed to delete this acl!"
 msgstr "Sie sind nicht berechtigt, diese ACL zu löschen!"
 
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+msgid "Access control list"
+msgstr "Zugriffskontrollliste"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
 #: plugins/admin/acl/class_divListACL.inc:31
 msgid "List of acl"
 msgstr "Liste der ACL"
@@ -13222,30 +13247,14 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, ausgewählte ACLs zu entfernen und zu "
 "bearbeiten."
 
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
 msgid "Display acls matching"
 msgstr "Zeige ACLs, auf die zutrifft"
 
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
 msgid "Acl"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Select to display users"
-msgstr "Zeige Benutzer"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Display user"
-msgstr "Zeige Benutzer"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Select to display departments"
-msgstr "Zeige Abteilungen"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Display departments"
-msgstr "Zeige Abteilungen"
-
 #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
 msgid "ACL management"
 msgstr "ACL-Verwaltung"
@@ -13270,32 +13279,34 @@ msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
 #, 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:519
+#: plugins/admin/fai/class_faiScript.inc:530
 #: plugins/admin/fai/class_faiHookEntry.inc:191
 msgid "FAI script"
 msgstr "FAI-Skript"
 
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
 msgid "Readonly"
 msgstr "Nur Lesen"
 
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
 #, 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:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
 msgid "FAI template"
 msgstr "FAI-Vorlage"
 
 #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
 msgid "FAI"
 msgstr "FAI"
 
@@ -13339,17 +13350,17 @@ msgstr "Der angegebene \"Freeze\"-Name ist ungültig."
 msgid "You are not allowed to create a new branch."
 msgstr "Es ist Ihnen nicht erlaubt, einen neuen Branch zu erstellen."
 
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
 #, php-format
 msgid "You are not allowed to create a new '%s' object."
 msgstr "Es ist Ihnen nicht erlaubt, ein neues '%s'-Objekt zu erstellen."
 
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
 msgid "FAI releases"
 msgstr "FAI Releases"
 
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
 msgid "FAI release management"
 msgstr "FAI Release-Verwaltung"
 
@@ -13369,11 +13380,11 @@ msgstr "Verwendete Pakete"
 msgid "Choosen packages"
 msgstr "Gewählte Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
 msgid "Toggle remove flag"
 msgstr "Entfernen-Flag umschalten"
 
@@ -13553,7 +13564,7 @@ msgstr "Paket-Gruppe"
 #: 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
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
@@ -13603,58 +13614,62 @@ msgstr "FAI-Hook"
 
 #: plugins/admin/fai/class_faiHook.inc:535
 #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
 msgid "Read only"
 msgstr "Nur Lesen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 msgid "primary"
 msgstr "primär"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 msgid "logical"
 msgstr "logisch"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
 msgid "FS type"
 msgstr "Dateisystem"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
 msgid "Mount point"
 msgstr "Mount-Punkt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
 msgid "Size in MB"
 msgstr "Größe in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
 msgid "Mount options"
 msgstr "Mount-Optionen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS option"
 msgstr "Dateisystem-Option"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
 msgid "Preserve"
 msgstr "Bewahren"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+msgid "Please specify a valid disc name."
+msgstr "Bitte geben Sie einen gültige Disk-Namen ein."
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
 #, 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:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 #, 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:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -13663,32 +13678,32 @@ msgstr ""
 "Dateisystem 'swap' wird bereits benutzt, ändern Sie bitte das Dateisystem "
 "für Partition %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
 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:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
 #, 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:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
 #, 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:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
 #, 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:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -13696,35 +13711,35 @@ 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
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
 msgid "Partition table entry"
 msgstr "Partitionstabellen-Eintrag"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
 msgid "FAI partition table entry"
 msgstr "FAI-Partitionstabellen-Eintrag"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
 msgid "Partition type"
 msgstr "Partitionstyp"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
 msgid "Partition no."
 msgstr "Partitionsnummer"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
 msgid "File system type"
 msgstr "Dateisystem-Typ"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
 msgid "Partition size"
 msgstr "Partitionsgröße"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
 msgid "File system options"
 msgstr "Dateisystem-Optionen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
 msgid "Partition flags"
 msgstr "Partitions-Flags"
 
@@ -13922,12 +13937,12 @@ msgstr "Wählen Sie den Klassen-Namen"
 msgid "A new class name."
 msgstr "Ein neuer Klassen-Name."
 
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
 #, 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:413
+#: plugins/admin/fai/class_faiVariable.inc:409
 msgid "FAI variable"
 msgstr "FAI-Variable"
 
@@ -14002,7 +14017,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Besitzer"
@@ -14169,34 +14184,38 @@ msgstr ""
 "prüfen Sie genau, da es keine Möglichkeit gibt, diese Aktion rückgängig zu "
 "machen."
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Paketliste"
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+"Unbekannter Typ der FAI-Quellen-Info. Dies ist weder ein Profil, eine "
+"Arbeitsstation noch eine Objektgruppe."
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
 msgid "This object has no FAI classes assigned."
 msgstr "Diesem Objekt sind keine FAI-Klassen zugeordnet."
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
 msgid "Open"
 msgstr "Aufklappen"
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
 msgid "No."
 msgstr "Nr."
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
 msgid "FS options"
 msgstr "Dateisystem-Optionen"
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-msgid "Viewable"
-msgstr "Sichtbar"
-
 #: plugins/admin/fai/branch_selector.tpl:21
 msgid "Create new branch"
 msgstr "Neuen Teilbaum erstellen"
@@ -14283,88 +14302,88 @@ msgstr "Zeige FAI-Partitionstabellen"
 msgid "Show partitions"
 msgstr "Zeige Partitionen"
 
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
 msgid "New scripts"
 msgstr "Neues Skript"
 
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
 msgid "New hooks"
 msgstr "Neuer Hook"
 
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "New variables"
 msgstr "Neue Variable"
 
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
 msgid "New templates "
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
 msgid "I"
 msgstr "I"
 
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
 #: plugins/admin/mimetypes/paste_generic.tpl:16
 msgid "Please enter a name for the mime type here"
 msgstr "Bitte geben Sie hier einen Namen für den MIME-Typ ein"
 
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
 msgid "Mime group"
 msgstr "MIME-Gruppe"
 
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
 msgid "Categorize this mime type"
 msgstr "Kategorie dieses MIME-Typs"
 
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
 msgid "Please specify a description"
 msgstr "Bitte geben Sie eine Beschreibung an"
 
@@ -14381,7 +14400,7 @@ msgid "Left click"
 msgstr "Linksklick"
 
 #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
 msgid "File patterns"
 msgstr "Datei-Muster"
 
@@ -14419,57 +14438,51 @@ msgstr "Zeige Datei mit externem Programm"
 msgid "Ask whether to save to local disk"
 msgstr "Frage nach, ob Datei lokal auf Festplatte gespeichert werden soll"
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
 #, php-format
 msgid "Saving of mime type/generic with dn '%s' failed."
 msgstr "Speichern von MIME-Typ/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
 #, php-format
 msgid "Removing of mime type/generic with dn '%s' failed."
 msgstr "Entfernen von MIME-Typ/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
 #, php-format
 msgid "Removing mime type from objectgroup '%s' failed"
 msgstr "Entfernen des MIME-Typs von Objektgruppe '%s' fehlgeschlagen"
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
 msgid "Please specify a valid name for this mime type."
 msgstr "Bitte geben Sie einen gültigen Namen für diesen MIME-Typ an."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
 msgid "Please specify at least one file pattern."
 msgstr "Bitte geben Sie mindestens ein Dateimuster an."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
 msgid "There's already a mime type with this 'Name'."
 msgstr "Eine MIME-Typ mit diesem Namen existiert bereits."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
 msgid "There's already an mime with this 'Name'."
 msgstr "Ein MIME-Typ mit diesem 'Namen' existiert bereits."
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen MIME-Typ unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
 msgid "Mime type generic"
 msgstr "MIME-Typ (Allgemein)"
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr "MIME-Typen"
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
 msgid "Left click action"
 msgstr "Linksklick-Aktion"
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
 msgid "Embedded applications"
 msgstr "Eingebettete Anwendungen"
 
@@ -14477,13 +14490,13 @@ msgstr "Eingebettete Anwendungen"
 msgid "Manage mime types"
 msgstr "MIME-Typen verwalten"
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
 #, php-format
 msgid "You're about to delete the mime type '%s'."
 msgstr "Sie löschen gerade den MIME-Typ '%s'."
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
 msgid "You are not allowed to delete this mime type!"
 msgstr "Sie haben keine Berechtigung, diesen MIME-Typ zu löschen!"
 
@@ -14514,7 +14527,7 @@ msgstr "MIME-Typ Name"
 msgid "Display mime types matching"
 msgstr "Zeige MIME-Typen, auf die Folgendes passt"
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
 msgid "Create new mime type"
 msgstr "Neuen MIME-Typ erstellen"
 
@@ -14548,7 +14561,7 @@ msgstr "nicht definiert"
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
 #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -14688,20 +14701,24 @@ msgstr "Entfernen von Benutzer/Telefon-Konto mit dn '%s' fehlgeschlagen."
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+msgid "GOfon reports"
+msgstr "GOfon-Berichte"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
 msgid "Telephone pin"
 msgstr "Telefon-PIN"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
@@ -14741,7 +14758,7 @@ 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:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
 msgid "Macro name"
 msgstr "Makro-Name"
 
@@ -14761,13 +14778,13 @@ msgstr "Makro-Inhalt"
 msgid "Phone macros"
 msgstr "Telefon-Makros"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
 #, 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:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
@@ -14776,7 +14793,7 @@ msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 msgid "This 'dn' is no phone macro."
 msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -14784,14 +14801,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:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
 #: 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:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
@@ -14799,65 +14816,69 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
 #, 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:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
 #, 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:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
 #, 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:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
 #, 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:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
 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:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
 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:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
 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:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
 #, 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:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
 msgid "Asterisk macro management"
 msgstr "Asterisk-Makro-Verwaltung"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:487
-msgid "Macro content"
-msgstr "Makro-Inhalt"
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+msgid "GOfon macro"
+msgstr "GOfon-Makro"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
+msgid "Macro content and parameter"
+msgstr "Makro-Inhalt und Parameter"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
@@ -14916,32 +14937,30 @@ msgstr "Makroname"
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: 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:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-msgid "Delete macro"
-msgstr "Makro entfernen"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
 msgid "invisible"
 msgstr "unsichtbar"
 
+#: plugins/gofon/macro/class_divListMacros.inc:147
+msgid "Edit macro"
+msgstr "Makro bearbeiten"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+msgid "Delete macro"
+msgstr "Makro entfernen"
+
 #: plugins/gofon/conference/headpage.tpl:6
 #: plugins/gofon/conference/class_divListConferences.inc:31
 #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -14980,7 +14999,7 @@ msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
 #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
@@ -14990,7 +15009,7 @@ msgid "PIN"
 msgstr "PIN"
 
 #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
@@ -14999,7 +15018,7 @@ msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
 #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
@@ -15028,7 +15047,7 @@ msgstr "Verwaltung"
 msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr "Entfernen von GOfonKonferenz/Allgemein mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -15036,24 +15055,24 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
 msgid "Please enter a PIN."
 msgstr "Bitte geben Sie eine PIN ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
 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:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Der Wert für 'Nummer' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Der Wert für 'Lebenszeit' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -15061,49 +15080,49 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
 #, 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:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
 msgid "Conference"
 msgstr "Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr "GOfon"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+msgid "GOfon conference"
+msgstr "GOfon-Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
 msgid "Conference PIN"
 msgstr "Konferenz-PIN"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
 msgid "Activate menu"
 msgstr "Menü aktivieren"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
 msgid "Announce user activity"
 msgstr "Melde Benutzer-Aktivität"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
 msgid "Count user"
 msgstr "Zähle Benutzer"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
 msgid "Conference type"
 msgstr "Konferenz-Typ"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
 msgid "Format"
 msgstr "Format"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
@@ -15119,43 +15138,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:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
 #: 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
+#: plugins/gofon/fonreports/class_fonreport.inc:400
 msgid "Source"
 msgstr "Quelle"
 
 #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
 msgid "Destination"
 msgstr "Ziel"
 
 #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
 msgid "Channel"
 msgstr "Kanal"
 
 #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
 msgid "Duration"
 msgstr "Dauer"
 
 #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
 #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
 msgid "Phone reports"
 msgstr "Telefon-Berichte"
 
@@ -15180,12 +15199,11 @@ msgstr ""
 msgid "Query for phone database failed!"
 msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:402
-#, fuzzy
+#: plugins/gofon/fonreports/class_fonreport.inc:403
 msgid "Application called"
 msgstr "Name der Anwendung"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
 msgid "Disposition"
 msgstr "Disposition"
 
@@ -15238,7 +15256,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -15262,15 +15280,15 @@ msgstr "statisch"
 msgid "method"
 msgstr "Methode"
 
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
 msgid "Trace"
 msgstr "Ablaufverfolgung"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
 msgid "Line"
 msgstr "Zeile"
 
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
 msgid "Arguments"
 msgstr "Argumente"
 
@@ -15361,7 +15379,7 @@ msgstr ""
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
@@ -15408,19 +15426,19 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1415
+#: include/functions.inc:1384
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1443
+#: include/functions.inc:1412
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1717
+#: include/functions.inc:1686
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1760
+#: include/functions.inc:1729
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -15429,7 +15447,7 @@ msgstr "GOsa Entwicklerversion (Rev %s)"
 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:53
+#: include/class_mail-methods-cyrus.inc:58
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -15437,52 +15455,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:151
+#: include/class_mail-methods-cyrus.inc:156
 #, 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:170
+#: include/class_mail-methods-cyrus.inc:175
 #, 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:196
+#: include/class_mail-methods-cyrus.inc:201
 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:214
+#: include/class_mail-methods-cyrus.inc:219
 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:236
+#: include/class_mail-methods-cyrus.inc:241
 #, 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:264
+#: include/class_mail-methods-cyrus.inc:269
 #, 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:277
+#: include/class_mail-methods-cyrus.inc:282
 #, 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:348
+#: include/class_mail-methods-cyrus.inc:353
 #, 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:352
+#: include/class_mail-methods-cyrus.inc:357
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
@@ -15523,7 +15541,7 @@ msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
 msgid "Unknown FAIstate %s"
 msgstr "unbekannter FAI-Status %s"
 
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -15532,17 +15550,17 @@ msgstr ""
 "Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
 "unterstützt. Bitte melden Sie dies an das Entwicklerteam."
 
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -15551,14 +15569,14 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
 "Zeile %s!"
 
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
 #, php-format
 msgid "Ldap import with dn '%s' failed."
 msgstr "LDAP-Import von dn '%s' fehlgeschlagen."
@@ -15572,7 +15590,7 @@ msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 msgid "References"
 msgstr "Referenzen"
 
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15580,7 +15598,7 @@ msgstr ""
 "Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15588,7 +15606,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15596,7 +15614,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15604,37 +15622,33 @@ msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Objekt '%s' ist bereits markiert"
 
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
 
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
 #, 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:1014
+#: include/class_plugin.inc:1015
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Entferne Markierung von Objekt '%s'"
 
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Speichern des Abbilds von Objekt mit dn '%s' fehlgeschlagen."
 
-#: include/class_plugin.inc:1137
-msgid "You are not allowed to delete this snapshot!"
-msgstr "Sie haben keine Berechtigung, dieses Abbild zu löschen!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -15643,7 +15657,7 @@ msgstr ""
 "Die Abbild-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
 "s' ist nicht in ihrer gosa.conf konfiguriert."
 
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
@@ -15652,17 +15666,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:1197
+#: include/class_plugin.inc:1193
 #, 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:1253
+#: include/class_plugin.inc:1249
 #, 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:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Wiederherstellen des Abbilds mit dn '%s' fehlgeschlagen."
@@ -15769,7 +15783,7 @@ msgstr ""
 "Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:472
+#: include/class_config.inc:477
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
@@ -16311,7 +16325,7 @@ msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Bitte stellen Sie sicher, "
 "dass der Server für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -16346,15 +16360,13 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
 
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
 msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
 msgstr ""
-"In ihrem Setup fehlt ein administratives Konto für GOsa, Sie sind deshalb "
-"nicht in der Lage, irgendetwas einzustellen!"
+"Benutzer und/oder Gruppe konnte nicht erstellt werden, bitte überprüfen Sie "
+"Ihre Konfiguration!"
 
 #: include/functions_helpviewer.inc:43
 #, php-format
@@ -16415,92 +16427,96 @@ msgstr "Vollständiger Teilbaum (permanent)"
 msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
 msgid "Edit ACL"
 msgstr "ACL Bearbeiten"
 
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
 msgid "Delete ACL"
 msgstr "ACL Entfernen"
 
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
 msgid "No ACL settings for this category"
 msgstr "Keine ACL-Einstellungen für diese Kategorie"
 
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Enthält ACLs für diese Objekte: %s"
 
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
 msgid "Edit categories ACLs"
 msgstr "ACLs dieser Kategorie bearbeiten"
 
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
 msgid "Clear categories ACLs"
 msgstr "ACLs dieser Kategorie leeren"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
 msgid "All objects in current subtree"
 msgstr "Alle Objekte im aktuellen Teilbaum"
 
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
 msgid "Show/Hide Advanced Settings"
 msgstr "Zeige/Verstecke Erweiterte Einstellungen"
 
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
 msgid "Modifyable by owner"
 msgstr "Änderbar vom Eigentümer"
 
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
 msgid "Move object"
 msgstr "Objekt verschieben"
 
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
 msgid "Remove object"
 msgstr "Objekt entfernen"
 
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+msgid "Complete object"
+msgstr "Vollständiges Objekt"
+
+#: include/class_acl.inc:718
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr "Unbekannter ACL-Typ '%s'. Verarbeitung nicht möglich."
 
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Unbekannter Eintrag '%s'!"
 
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
 msgid "Members:"
 msgstr "Mitglieder:"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
 msgid "ACL is valid for all users"
 msgstr "ACL ist gültig für alle Benutzer"
 
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
 #, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Speichern der ACLs von dn '%s' fehlgeschlagen."
@@ -16509,7 +16525,7 @@ msgstr "Speichern der ACLs von dn '%s' fehlgeschlagen."
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16517,24 +16533,24 @@ msgstr ""
 "Fehler: Der angeforderte Teilbaum besitzt eine Inkonsistenz in der DN-"
 "Kodierung. Prüfen Sie den LDAP!"
 
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
 msgid "Restore snapshopts of already deleted objects"
 msgstr "Stelle Abzüge von bereits entfernten Objekten her"
 
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
 msgid "Create snapshot"
 msgstr "Abbild erstellen"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle ein neues Abbild dieses Objekts"
 
@@ -16554,43 +16570,56 @@ msgstr ""
 "Es wurde mehr als eine Reverse-Zone für DNS-Zone '%s' gefunden. Das Einlesen "
 "wurde abgebrochen."
 
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+"Unbekannter Zonenname '%s'. Zonennamen müssen ungefähr so aussehen: 'server/"
+"zone.com'."
+
+#: include/class_CopyPasteHandler.inc:147
+#, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "Sie sind dabei, den ausgeschnitten Eintrag '%s' einzufügen."
+
+#: include/class_CopyPasteHandler.inc:174
 #, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr "Sie kopieren gerade den Eintrag %s."
+msgid "You are going to paste the copied entry '%s'."
+msgstr "Sie sind dabei, den kopierten Eintrag '%s' einzufügen."
 
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
 msgid "Can't paste"
 msgstr "Kann nicht einfügen"
 
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
 #, php-format
 msgid "Error, following objects should be equal '%s' and '%s'"
 msgstr "Fehler, die folgenden Objekte sollten gleich sein: '%s' und '%s'"
 
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
 #, php-format
 msgid "Release management failed, can't save '%s'"
 msgstr "Release-Verwaltung fehlgeschlagen, kann '%s' nicht speichern"
 
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Sie sind dabei das Abbild '%s' zu entfernen."
 
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
 msgid "Remove snapshot"
 msgstr "Abbild entfernen."
 
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
 msgid "Please specify a valid description for this snapshot."
 msgstr "Bitte geben Sie eine gültige Beschreibung für diesen Abzug an."
 
@@ -16635,7 +16664,7 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden, überprüfen Sie die Existenz und die Rechte!"
 
-#: html/main.php:170
+#: html/main.php:172
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
@@ -16643,28 +16672,20 @@ msgstr ""
 "FATAL: 'Register globals' ist im PHP aktiviert. GOsa läßt keine Anmeldung "
 "zu, bis dies von einem Administrator behoben wurde."
 
-#: html/main.php:212
+#: html/main.php:214
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Achtung: die Speichernutzung ist zu hoch - bitte erhöhen Sie das "
 "memory_limit!"
 
-#: 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:364
+#: html/main.php:353
 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:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-"Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
-"Seite!"
+#: html/main.php:361
+#, 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/getkiosk.php:25
 #, php-format
@@ -16676,11 +16697,11 @@ msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
 msgid "Can't read file '%s', check permissions."
 msgstr "Kann Datei '%s' nicht lesen, überprüfen Sie die Rechte."
 
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
@@ -16704,30 +16725,38 @@ msgstr ""
 "GOsa kann keine Informationen über die verfügbaren Schema-Definitionen "
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
-#: html/index.php:232
+#: html/index.php:231
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Ihr LDAP-Server enthält veraltete Schema-Definitionen. Bitte führen Sie "
 "erneut die Einrichtung durch."
 
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"In ihrem Setup fehlt ein administratives Konto für GOsa, Sie sind deshalb "
+"nicht in der Lage, irgendetwas einzustellen!"
+
+#: html/index.php:258
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:262
+#: html/index.php:260
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:269
+#: html/index.php:267
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:293
+#: html/index.php:291
 msgid "Account locked. Please contact your system administrator."
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator."
 
-#: html/index.php:345
+#: html/index.php:343
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -16880,7 +16909,7 @@ msgstr ""
 "Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
 "Größenbeschränkung liegen"
 
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
 msgid "Please use your username and password to log in"
 msgstr "Melden Sie sich bitte mit Ihrem Benutzernamen und Ihrem Passwort an"
 
@@ -17274,7 +17303,7 @@ msgstr "ACLs für dieses Objekt"
 msgid "Copy & paste wizard"
 msgstr "Kopieren & Einfügen - Assistent"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
 msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. GOsa shows the relevant attributes. Please "
@@ -17285,7 +17314,22 @@ msgstr ""
 "Attribute. Bitte verwalten Sie die Werte, die unten angezeigt werden, um die "
 "Auflagen zu erfüllen."
 
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+"Beachten Sie, dass manche Einstellungen wie z.B. erstellte Abbilder nicht "
+"kopiert werden!"
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+"Oder wenn sie einen Eintrag in GOsa kopieren oder ausschneiden und das "
+"Quellobjekt entfernen, werden Sie wahrscheinlich wieder eine Fehlermeldung "
+"erhalten, wenn Sie das Objekt einfügen!"
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
 msgid "Operation complete"
 msgstr "Vorgang abgeschlossen"
 
@@ -17329,21 +17373,40 @@ msgstr ""
 "dabei das vorhandene überschreiben, nachdem Sie den Wiederherstellen-Knopf "
 "gedrückt haben."
 
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+"Beachten Sie, dass die DNS-Konfiguration mitsamt den Datenbankeinträgen "
+"nicht wiederhergestellt werden kann.Für manche Objekte reicht es bereits, "
+"sie zu öffnen und zu speichen (GOfon), andere Einträge müssen manuell "
+"erstellt werden (glpi)."
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+"Vergessen Sie nicht, Verweise auf andere Objekte zu überprüfen, bspw. ob der "
+"gewählte Drucker noch existiert."
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
 msgid "There is no snapshot available that could be restored"
 msgstr "Es ist kein Abbild verfügbar, das wiederhergestellt werden kann"
 
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
 msgstr ""
 "Wählen Sie ein Abbild und klicken Sie auf das Ordner-Bild, um es "
 "wiederherzustellen."
 
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
 msgid "Creating object snapshots"
 msgstr "Erstelle Objekte-Abbilder"
 
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
 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 "
@@ -17353,14 +17416,120 @@ msgstr ""
 "innerhalb eines speziellen Zweiges Ihres Verzeichnisses gespeichert und kann "
 "später wieder hergestellt werden."
 
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+"Beachten Sie, dass Datenbankeinträge, DNS-Konfigurationen und evtl. "
+"erstellte Zonen in den Server-Erweiterungen nicht im Abbild gespeichert "
+"werden."
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
 msgid "Reason for generating this snapshot"
 msgstr "Grund für das Erzeugen dieses Abbilds"
 
+#~ msgid ""
+#~ "As soon as the move operation has finished, you can scroll down to end of "
+#~ "the page and press the 'Continue' button to continue with the department "
+#~ "management dialog."
+#~ msgstr ""
+#~ "Sobald der Vorgang abgeschlossen wurde, können Sie zum unteren Ende der "
+#~ "Seite blättern und auf den 'Weiter'-Knopf drücken, um zum Abteilungs-"
+#~ "Verwaltungs-Dialog zurück zu gelangen."
+
+#~ msgid "Go to users home department"
+#~ msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
+
+#~ msgid "Select to display users"
+#~ msgstr "Zeige Benutzer"
+
+#~ msgid "Display user"
+#~ msgstr "Zeige Benutzer"
+
+#~ msgid "Select to display departments"
+#~ msgstr "Zeige Abteilungen"
+
+#~ msgid "Display departments"
+#~ msgstr "Zeige Abteilungen"
+
+#~ msgid ""
+#~ "Generating this page caused the W3C          conformance checker to raise "
+#~ "some errors!"
+#~ msgstr ""
+#~ "Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
+#~ "Seite!"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, diesen Benutzer in die angegebene 'Basis' "
+#~ "zu verschieben."
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a group on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, eine Anwendung unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a terminal on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a server on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a phone on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, einen MIME-Typ unterhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "GOfon"
+#~ msgstr "GOfon"
+
+#~ msgid "You are not allowed to set this systems password!"
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
+
+#~ msgid "The host name '%s' should be written in lowercase."
+#~ msgstr "Der Hostname '%s' sollte in Kleinbuchstaben geschrieben werden."
+
+#~ msgid "Viewable"
+#~ msgstr "Sichtbar"
+
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "Sie haben keine Berechtigung, dieses Abbild zu löschen!"
+
 #~ msgid "you are not using any strange characters in the loginname."
 #~ msgstr "Sie verwenden keine ungewöhnlichen Zeichen im Benutzernamen."
 
@@ -17931,9 +18100,6 @@ msgstr "Grund für das Erzeugen dieses Abbilds"
 #~ msgid "Saving FAI hook failed"
 #~ msgstr "Speichern des FAI-Hooks ist fehlgeschlagen"
 
-#~ msgid "Removing FAI profile failed"
-#~ msgstr "Entfernen des FAI-Profils fehlgeschlagen"
-
 #~ msgid "Removing FAI partition table failed"
 #~ msgstr "Entfernen der FAI-Partitionstabelle ist fehlgeschlagen"