Added Translation Strings.

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

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 13df1c74bd784a4aa8682ce8a3255db10a0e4993..9813446fc7ca5ff22134078e3047101aded3157d 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2006-03-01 12:24+0100\n"
+"PO-Revision-Date: 2006-05-12 17:20+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit"
@@ -23,27 +23,30 @@ msgstr ""
 msgid "My account"
 msgstr "Mein Konto"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:89 contrib/gosa.conf:98
-#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:115
-#: contrib/gosa.conf:124 contrib/gosa.conf:140 contrib/gosa.conf:149
-#: contrib/gosa.conf:154 contrib/gosa.conf:159 contrib/gosa.conf:164
-#: contrib/gosa.conf:169 contrib/gosa.conf:174
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/glpi.tpl:6
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
@@ -61,129 +64,133 @@ msgstr "Allgemein"
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:90
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:413
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/groups/class_divListGroup.inc:137
+#: plugins/admin/users/class_divListUsers.inc:170
 msgid "Environment"
 msgstr "Umgebung"
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:92
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:401
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/groups/class_divListGroup.inc:129
+#: plugins/admin/users/class_divListUsers.inc:172
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/admin/ogroups/class_ogroupManagement.inc:492
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:404
-#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/admin/groups/class_divListGroup.inc:131
+#: plugins/admin/users/class_divListUsers.inc:178
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:180
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: contrib/gosa.conf:82 plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:380
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_divListUsers.inc:176
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:232
-#: plugins/personal/generic/generic.tpl:370
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:410
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/groups/class_divListGroup.inc:135
+#: plugins/admin/users/class_divListUsers.inc:174
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_systemManagement.inc:741
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
+#: plugins/admin/ogroups/class_ogroupManagement.inc:61
+#: plugins/admin/ogroups/class_ogroupManagement.inc:596
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefon"
 
-#: contrib/gosa.conf:84 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:85 contrib/gosa.conf:94 contrib/gosa.conf:100
-#: contrib/gosa.conf:105 contrib/gosa.conf:111 contrib/gosa.conf:120
-#: contrib/gosa.conf:136 contrib/gosa.conf:145 contrib/gosa.conf:150
-#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
-#: contrib/gosa.conf:170 contrib/gosa.conf:175
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Referenzen"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: contrib/gosa.conf:93
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: contrib/gosa.conf:99 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:67
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:250
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:110 plugins/admin/systems/servdnseditzone.tpl:88
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Start"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:142
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:497
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: plugins/personal/environment/environment.tpl:173
+#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/ogroups/class_ogroupManagement.inc:62
+#: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:135 contrib/gosa.conf:144
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
@@ -196,29 +203,30 @@ msgstr "Drucker"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:125
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repository"
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:197 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -227,86 +235,90 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:199 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/admin/applications/generic.tpl:94
+#: plugins/admin/applications/generic.tpl:95
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:204
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:208 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:92
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:212 plugins/admin/fai/class_faiManagement.inc:756
-#: plugins/admin/fai/class_faiManagement.inc:757
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
+#: plugins/admin/fai/class_faiManagement.inc:769
+#: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:216 plugins/admin/fai/class_faiManagement.inc:749
-#: plugins/admin/fai/class_faiManagement.inc:750
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
+#: plugins/admin/fai/class_faiManagement.inc:762
+#: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:220 plugins/admin/fai/class_faiManagement.inc:770
-#: plugins/admin/fai/class_faiManagement.inc:771
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
+#: plugins/admin/fai/class_faiManagement.inc:783
+#: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:224 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:228
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -316,19 +328,18 @@ msgid "Select addresses to add"
 msgstr "Wählen Sie die hinzuzufügenden Adressen"
 
 #: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/groups/mail_locals.tpl:22
+#: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/servRepository.tpl:36
@@ -343,18 +354,19 @@ msgstr "W
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filter"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
+#: plugins/personal/posix/posix_groups.tpl:34
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
 #: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:32
+#: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
@@ -366,7 +378,7 @@ msgstr "W
 #: plugins/personal/samba/samba3_workstations.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:45
 msgid "Regular expression for matching addresses"
-msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
+msgstr "Regulärer Ausdruck zum Erkennen von Mail-Adressen"
 
 #: plugins/personal/mail/mail_locals.tpl:32
 #: plugins/admin/groups/mail_locals.tpl:52
@@ -380,17 +392,20 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:65
+#: plugins/personal/posix/posix_groups.tpl:69
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
@@ -398,13 +413,17 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
-#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:486
+#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:27
+#: plugins/admin/groups/class_groupMail.inc:534
 #: plugins/admin/groups/generic.tpl:104
-#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/groups/paste_mail.tpl:30
+#: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -422,28 +441,31 @@ 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:423
-#: plugins/admin/systems/class_termDNS.inc:444
+#: plugins/admin/systems/class_termDNS.inc:426
+#: plugins/admin/systems/class_termDNS.inc:446
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:277
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:388
 #: plugins/admin/ogroups/generic.tpl:39
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/fai/faiVariable.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:61 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:40
-#: plugins/admin/fai/faiHook.tpl:48 plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr "Hinzufügen"
 
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/posix_groups.tpl:71
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/connectivity/main.inc:120
@@ -452,7 +474,7 @@ msgstr "Hinzuf
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -460,22 +482,23 @@ msgstr "Hinzuf
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:345
+#: plugins/admin/groups/class_groupManagement.inc:328
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:57
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:642
-#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:310
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/departments/class_departmentManagement.inc:395
+#: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:115
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -483,21 +506,22 @@ msgstr "Hinzuf
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/servdnseditzone.tpl:122
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/ogroups/class_ogroupManagement.inc:410
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:598
-#: plugins/admin/fai/class_faiManagement.inc:603
+#: plugins/admin/fai/class_faiManagement.inc:608
+#: plugins/admin/fai/class_faiManagement.inc:613
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -506,28 +530,30 @@ msgstr "Hinzuf
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiPackageNew.tpl:45
-#: plugins/admin/fai/faiNewBranch.tpl:18
+#: plugins/admin/fai/faiPackageNew.tpl:51
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:307
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
+#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Primäre Adresse"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:742
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -541,8 +567,8 @@ msgid "Quota usage"
 msgstr "Kontingent-Nutzung"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:418
+#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_printGeneric.inc:483
 msgid "not defined"
 msgstr "nicht definiert"
 
@@ -550,35 +576,43 @@ msgstr "nicht definiert"
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
+#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
+#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
+#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
 #: plugins/admin/systems/phonesettings.tpl:170
 #: plugins/admin/systems/phonesettings.tpl:185
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
 #: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:167
+#: plugins/personal/environment/environment.tpl:183
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:52
 #: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
-#: plugins/admin/groups/generic.tpl:106 plugins/admin/users/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:106 plugins/admin/groups/paste_mail.tpl:31
+#: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -592,17 +626,18 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:438
+#: plugins/admin/systems/class_termDNS.inc:440
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:271
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:472
 #: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/conference/remove.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Entfernen"
 
@@ -665,11 +700,14 @@ msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
 #: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
 #: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
+#: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
@@ -696,31 +734,46 @@ msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/personal/environment/main.inc:104
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
 #: plugins/personal/nagios/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:640
-#: plugins/admin/applications/class_applicationManagement.inc:308
-#: plugins/admin/departments/class_departmentManagement.inc:347
-#: plugins/admin/systems/class_systemManagement.inc:720
-#: plugins/admin/ogroups/class_ogroupManagement.inc:346
-#: plugins/admin/fai/class_faiManagement.inc:596
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/users/class_userManagement.inc:623
+#: plugins/admin/applications/class_applicationManagement.inc:403
+#: plugins/admin/departments/class_departmentManagement.inc:393
+#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/systems/servnfs.tpl:114
+#: 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:121
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/ogroups/class_ogroupManagement.inc:408
+#: plugins/admin/fai/class_faiManagement.inc:606
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-msgid "Finish"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:264
+#: include/class_MultiSelectWindow.inc:68
+#: ihtml/themes/default/copyPasteDialog.tpl:14
+msgid "Save"
 msgstr "Speichern"
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -730,9 +783,9 @@ msgstr ""
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
 #: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -744,10 +797,10 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/fai/faiVariable.tpl:44
+#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:41
-#: plugins/admin/fai/faiHook.tpl:45 plugins/gofon/phoneaccount/main.inc:113
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -755,6 +808,10 @@ msgstr "Bearbeiten"
 msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
+msgstr "Mail-Einstellungen"
+
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
@@ -784,8 +841,9 @@ msgstr "Benutzer Mail-Einstellungen"
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
 #: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
 #: plugins/admin/applications/class_applicationManagement.inc:26
 #: plugins/admin/departments/class_departmentManagement.inc:26
 #: plugins/admin/systems/class_systemManagement.inc:33
@@ -797,29 +855,29 @@ msgid "This does something"
 msgstr "Dies tut etwas"
 
 #: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:62
+#: plugins/admin/groups/class_groupMail.inc:75
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 "Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
 "verfügbar."
 
-#: plugins/personal/mail/class_mailAccount.inc:171
+#: plugins/personal/mail/class_mailAccount.inc:180
 msgid "No DESC tag in vacation file:"
 msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
 
-#: plugins/personal/mail/class_mailAccount.inc:211
+#: plugins/personal/mail/class_mailAccount.inc:220
 msgid "This account has no mail extensions."
 msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
-#: plugins/personal/mail/class_mailAccount.inc:220
-#: plugins/admin/groups/class_groupMail.inc:267
+#: plugins/personal/mail/class_mailAccount.inc:229
+#: plugins/admin/groups/class_groupMail.inc:314
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
-#: plugins/personal/mail/class_mailAccount.inc:221
-#: plugins/admin/groups/class_groupMail.inc:268
+#: plugins/personal/mail/class_mailAccount.inc:230
+#: plugins/admin/groups/class_groupMail.inc:315
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -827,14 +885,14 @@ msgstr ""
 "Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:223
-#: plugins/admin/groups/class_groupMail.inc:270
+#: plugins/personal/mail/class_mailAccount.inc:232
+#: plugins/admin/groups/class_groupMail.inc:317
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
-#: plugins/personal/mail/class_mailAccount.inc:223
-#: plugins/admin/groups/class_groupMail.inc:271
+#: plugins/personal/mail/class_mailAccount.inc:232
+#: plugins/admin/groups/class_groupMail.inc:318
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -842,87 +900,96 @@ msgstr ""
 "Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
 "Sie auf die untere Schaltfläche klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:271
+#: plugins/personal/mail/class_mailAccount.inc:280
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
 "aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:277
-#: plugins/admin/groups/class_groupMail.inc:330
+#: plugins/personal/mail/class_mailAccount.inc:286
+#: plugins/admin/groups/class_groupMail.inc:377
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
 "Sinn."
 
-#: plugins/personal/mail/class_mailAccount.inc:312
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/admin/groups/class_groupMail.inc:358
+#: plugins/personal/mail/class_mailAccount.inc:321
+#: plugins/personal/mail/class_mailAccount.inc:326
+#: plugins/admin/groups/class_groupMail.inc:405
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:363
+#: plugins/personal/mail/class_mailAccount.inc:336
+#: plugins/admin/groups/class_groupMail.inc:410
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
 "anderen Benutzer verwendet"
 
-#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/personal/mail/class_mailAccount.inc:572
+msgid "Removing mail account failed"
+msgstr "Entfernen des Mail-Kontos fehlgeschlagen"
+
+#: plugins/personal/mail/class_mailAccount.inc:675
+msgid "Saving mail account failed"
+msgstr "Speichern des Mail-Kontos fehlgeschlagen"
+
+#: plugins/personal/mail/class_mailAccount.inc:720
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Es wurde kein gültiger Mail-Server angegeben, bitte fügen Sie ein passendes "
 "System hinzu."
 
-#: plugins/personal/mail/class_mailAccount.inc:710
-#: plugins/admin/groups/class_groupMail.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/admin/groups/class_groupMail.inc:805
 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:714
-#: plugins/personal/mail/class_mailAccount.inc:718
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
+#: plugins/personal/mail/class_mailAccount.inc:729
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/addons/addressbook/class_addressbook.inc:590
+#: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:828
-#: plugins/admin/ogroups/class_mailogroup.inc:77
+#: plugins/personal/mail/class_mailAccount.inc:739
+#: plugins/admin/groups/class_groupMail.inc:814
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 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:730
-#: plugins/admin/groups/class_groupMail.inc:834
+#: plugins/personal/mail/class_mailAccount.inc:745
+#: plugins/admin/groups/class_groupMail.inc:820
 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:739
-#: plugins/admin/groups/class_groupMail.inc:843
+#: plugins/personal/mail/class_mailAccount.inc:754
+#: plugins/admin/groups/class_groupMail.inc:829
 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:749
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:764
+#: plugins/admin/groups/class_groupMail.inc:837
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
-#: plugins/personal/mail/class_mailAccount.inc:753
+#: plugins/personal/mail/class_mailAccount.inc:768
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/personal/password/password_expired.tpl:2
+#: plugins/admin/users/class_divListUsers.inc:152
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -937,6 +1004,7 @@ msgstr ""
 "dieses nicht mehr anmelden können."
 
 #: plugins/personal/password/password.tpl:10
+#: plugins/personal/password/password_expired.tpl:10
 #: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
@@ -946,29 +1014,33 @@ msgstr ""
 "Proxy-, Samba- und Unix-Diensten aus."
 
 #: plugins/personal/password/password.tpl:15
+#: plugins/personal/password/password_expired.tpl:15
 msgid "Current password"
 msgstr "Momentanes Passwort"
 
 #: plugins/personal/password/password.tpl:20
+#: plugins/personal/password/password_expired.tpl:20
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Neues Passwort"
 
 #: plugins/personal/password/password.tpl:25
+#: plugins/personal/password/password_expired.tpl:25
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Neues Passwort (Wiederholung)"
 
 #: plugins/personal/password/password.tpl:34
+#: plugins/personal/password/password_expired.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/personal/connectivity/opengw.tpl:49
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Passwort setzen"
 
 #: plugins/personal/password/password.tpl:36
+#: plugins/personal/password/password_expired.tpl:36
 msgid "Clear fields"
 msgstr "Felder löschen"
 
@@ -987,7 +1059,9 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: include/functions.inc:1345 ihtml/themes/altlinux/setup_step2.tpl:12
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1365
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -1001,13 +1075,14 @@ msgid "Back"
 msgstr "Zurück"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/personal/generic/paste_generic.tpl:32
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
 #: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Passwort"
@@ -1025,7 +1100,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:271
+#: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1034,7 +1109,7 @@ msgstr ""
 "(Wiederholung)' eingegeben haben sind nicht identisch."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:276
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
@@ -1056,9 +1131,21 @@ msgstr "Sie haben keine Berechtigung ihr Passwort zu 
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/password/password_expired.tpl:6
+#, fuzzy
+msgid ""
+"Your password has expired. To change your personal password use the fields "
+"below. The changes take effect immediately. Please memorize the new "
+"password, because you wouldn't be able to login without it."
+msgstr ""
+"Um das Passwort zu ändern, benutzen Sie das untere Feld. Die Änderung wird "
+"sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne "
+"dieses nicht mehr anmelden können."
+
+#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:643
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -1079,22 +1166,27 @@ msgid "Status"
 msgstr "Status"
 
 #: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr "Erzwinge UID/GID"
 
-#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/paste_generic.tpl:37
 msgid "GID"
 msgstr "GID"
 
 #: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr "Gruppenmitgliedschaft"
 
 #: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
 
@@ -1114,27 +1206,27 @@ msgstr "Vertrauens-Modus"
 msgid "Select groups to add"
 msgstr "Wählen Sie die hinzuzufügenden Gruppen"
 
-#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/personal/posix/posix_groups.tpl:31
 msgid "Display groups of department"
 msgstr "Zeige Gruppen der Abteilung"
 
-#: plugins/personal/posix/posix_groups.tpl:41
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:43
+#: plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Zeige Gruppen, auf die zutrifft"
 
-#: plugins/personal/posix/posix_groups.tpl:44
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:47
+#: plugins/admin/groups/class_divListGroup.inc:66
+#: plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
-msgstr "Regulärer Ausdruck zum Suchen in Gruppennamen"
+msgstr "Regulärer Ausdruck zum Erkennen von Gruppennamen"
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:54
 msgid "Display groups of user"
 msgstr "Zeige Gruppen des Benutzers"
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/admin/groups/class_divListGroup.inc:67
 msgid "User name of which groups are shown"
 msgstr "Benutzername, dessen Gruppen angezeigt werden"
 
@@ -1156,7 +1248,7 @@ msgid "Display systems of department"
 msgstr "Zeige die Systeme der Abteilung"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
@@ -1169,33 +1261,53 @@ msgstr "UNIX-Einstellungen"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:989
+#: plugins/personal/posix/class_posixAccount.inc:124
+msgid "expired"
+msgstr "abgelaufen"
+
+#: plugins/personal/posix/class_posixAccount.inc:126
+msgid "grace time active"
+msgstr "Nachfrist aktiv"
+
+#: plugins/personal/posix/class_posixAccount.inc:129
+msgid "active, password not changable"
+msgstr "aktiv, Passwort kann nicht geändert werden"
+
+#: plugins/personal/posix/class_posixAccount.inc:131
+msgid "active, password expired"
+msgstr "aktiv, Passwort abgelaufen"
+
+#: plugins/personal/posix/class_posixAccount.inc:133
+msgid "active"
+msgstr "aktiv"
+
+#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:959
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/admin/systems/class_workstationStartup.inc:500
-#: plugins/admin/systems/class_workstationService.inc:114
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/personal/posix/class_posixAccount.inc:202
+#: plugins/admin/systems/class_terminalService.inc:141
+#: plugins/admin/systems/class_workstationStartup.inc:690
+#: plugins/admin/systems/class_workstationService.inc:133
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:241
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto besitzt keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:248
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: plugins/personal/posix/class_posixAccount.inc:264
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:262
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1203,7 +1315,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:252
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1211,11 +1323,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:255
+#: plugins/personal/posix/class_posixAccount.inc:268
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:269
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1223,252 +1335,266 @@ 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:455
+#: plugins/personal/posix/class_posixAccount.inc:436
 #, 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:457
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, 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:459
+#: plugins/personal/posix/class_posixAccount.inc:440
 #, 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:461
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, 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:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Januar"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Februar"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "März"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "April"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Juni"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Juli"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "August"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "September"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Oktober"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "November"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Dezember"
 
-#: plugins/personal/posix/class_posixAccount.inc:569
-#: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/personal/posix/class_posixAccount.inc:550
+#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:550
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:570
+#: plugins/personal/posix/class_posixAccount.inc:551
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/personal/posix/class_posixAccount.inc:742
+#: plugins/personal/posix/class_posixAccount.inc:597
+#, fuzzy
+msgid "Removing UNIX account failed"
+msgstr "Nagios-Konto entfernen"
+
+#: plugins/personal/posix/class_posixAccount.inc:723
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:812
+#, fuzzy
+msgid "Saving UNIX account failed"
+msgstr "Unix-Konten"
+
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "The required field 'Home directory' is not set."
 msgstr "Das benötigte Feld 'Basisverzeichnis' ist nicht gesetzt."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:876
 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:914
+#: plugins/personal/posix/class_posixAccount.inc:884
 msgid "Value specified as 'UID' is not valid."
 msgstr "Die von ihnen angebene 'UID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:917
+#: plugins/personal/posix/class_posixAccount.inc:887
 msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:921
-#: plugins/admin/groups/class_groupGeneric.inc:686
+#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/admin/groups/class_groupGeneric.inc:773
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:924
-#: plugins/admin/groups/class_groupGeneric.inc:689
+#: plugins/personal/posix/class_posixAccount.inc:894
+#: plugins/admin/groups/class_groupGeneric.inc:776
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:902
 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:937
+#: plugins/personal/posix/class_posixAccount.inc:907
 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:942
+#: plugins/personal/posix/class_posixAccount.inc:912
 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:945
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:918
 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:951
+#: plugins/personal/posix/class_posixAccount.inc:921
 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:956
+#: plugins/personal/posix/class_posixAccount.inc:926
 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:959
+#: plugins/personal/posix/class_posixAccount.inc:929
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:964
+#: plugins/personal/posix/class_posixAccount.inc:934
 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:1091
-#: plugins/admin/groups/class_groupGeneric.inc:725
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/admin/groups/class_groupGeneric.inc:812
 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/paste_generic.tpl:4
+msgid "Posix settings"
+msgstr "UNIX-Einstellungen"
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Samba-Basisverzeichnis"
@@ -1479,7 +1605,7 @@ msgstr "Anmeldeskript"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/class_sambaAccount.inc:644
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
@@ -1528,17 +1654,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:648
+#: plugins/personal/samba/class_sambaAccount.inc:651
 msgid "Connection"
 msgstr "Verbinden"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid "Disconnection"
 msgstr "Trennen"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:650
+#: plugins/personal/samba/class_sambaAccount.inc:653
 msgid "IDLE"
 msgstr "Leerlauf"
 
@@ -1607,15 +1733,15 @@ msgstr "W
 msgid "Display workstations of department"
 msgstr "Zeige die Arbeitsstationen der Abteilung"
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto besitzt keine Samba-Erweiterungen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:207
 msgid "Remove samba account"
 msgstr "Samba-Konto entfernen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:206
+#: plugins/personal/samba/class_sambaAccount.inc:208
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1623,12 +1749,12 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Samba-Erweiterungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:216
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:218
+#: plugins/personal/samba/class_sambaAccount.inc:221
 msgid "Create samba account"
 msgstr "Samba-Konto erstellen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1636,7 +1762,7 @@ msgstr ""
 "Dieses Konto besitzt deaktivierte Samba-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:220
+#: plugins/personal/samba/class_sambaAccount.inc:222
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1645,44 +1771,49 @@ msgstr ""
 "aktivieren werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert "
 "werden."
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:458
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "disconnect"
 msgstr "trennen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:627
+#, fuzzy
+msgid "Removing Samba account failed"
+msgstr "Samba-Konto entfernen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/class_sambaAccount.inc:656
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1690,7 +1821,7 @@ msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/class_sambaAccount.inc:662
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1698,7 +1829,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:843
+#: plugins/personal/samba/class_sambaAccount.inc:846
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1706,7 +1837,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:867
+#: plugins/personal/samba/class_sambaAccount.inc:870
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1714,6 +1845,10 @@ msgstr ""
 "Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, daher "
 "kann keine Umwandlung in eine Samba-Gruppe vorgenommen werden!"
 
+#: plugins/personal/samba/class_sambaAccount.inc:974
+msgid "Saving Samba account failed"
+msgstr "Speichern des Samba-Kontos fehlgeschlagen"
+
 #: plugins/personal/generic/class_user.inc:256
 msgid "female"
 msgstr "weiblich"
@@ -1755,51 +1890,59 @@ msgstr "ung
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:879
+#: plugins/personal/generic/class_user.inc:544
+msgid "Removing generic user account failed"
+msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+
+#: plugins/personal/generic/class_user.inc:833
+msgid "Saving generic user account failed"
+msgstr "Speichern des allgemeinen Benutzerkontos fehlgeschlagen"
+
+#: plugins/personal/generic/class_user.inc:880
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:897
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:907
+#: plugins/personal/generic/class_user.inc:908
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:947
+#: plugins/personal/generic/class_user.inc:952
 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:952
+#: plugins/personal/generic/class_user.inc:957
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:554
+#: plugins/personal/generic/class_user.inc:963
+#: plugins/addons/addressbook/class_addressbook.inc:547
+#: plugins/admin/users/class_userManagement.inc:517
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:967
+#: plugins/personal/generic/class_user.inc:972
 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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:557
+#: plugins/personal/generic/class_user.inc:978
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/users/class_userManagement.inc:520
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:976
+#: plugins/personal/generic/class_user.inc:981
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:988
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1807,7 +1950,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:995
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1815,49 +1958,49 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:993
+#: plugins/personal/generic/class_user.inc:998
 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:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:202
+#: plugins/personal/generic/class_user.inc:1001
+#: plugins/personal/generic/class_user.inc:1026
+#: plugins/addons/addressbook/class_addressbook.inc:557
+#: plugins/addons/addressbook/class_addressbook.inc:585
+#: plugins/admin/departments/class_departmentGeneric.inc:251
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/personal/generic/class_user.inc:1023
+#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/addons/addressbook/class_addressbook.inc:582
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:205
+#: plugins/personal/generic/class_user.inc:1009
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/admin/departments/class_departmentGeneric.inc:254
 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:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:208
+#: plugins/personal/generic/class_user.inc:1012
+#: plugins/addons/addressbook/class_addressbook.inc:571
+#: plugins/admin/departments/class_departmentGeneric.inc:257
 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:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/personal/generic/class_user.inc:1015
+#: plugins/addons/addressbook/class_addressbook.inc:574
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:577
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1140
+#: plugins/personal/generic/class_user.inc:1145
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
@@ -1865,109 +2008,119 @@ msgstr "Die angegebene Datei konnte nicht ge
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: plugins/personal/generic/generic.tpl:15
-#: plugins/personal/generic/generic_picture.tpl:6
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/generic.tpl:17
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
 msgstr "Bild ändern"
 
-#: plugins/personal/generic/generic.tpl:25
+#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:19
+#: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/generic.tpl:30
+#: plugins/personal/generic/generic.tpl:48
 msgid "Template name"
 msgstr "Name der Vorlage"
 
-#: plugins/personal/generic/generic.tpl:37
+#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:23
+#: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
+#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Kennung"
 
-#: plugins/personal/generic/generic.tpl:49
+#: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/generic.tpl:57
+#: plugins/personal/generic/generic.tpl:75
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/generic.tpl:65
+#: plugins/personal/generic/generic.tpl:83
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Setzen"
 
-#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/generic.tpl:116
 msgid "Preferred langage"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/generic.tpl:109
+#: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
-#: plugins/admin/groups/class_groupManagement.inc:369
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:319
+#: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:113
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:336
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/departments/class_departmentManagement.inc:327
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:771
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_ogroupManagement.inc:374
-#: plugins/admin/fai/class_faiManagement.inc:667
+#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/fai/class_faiManagement.inc:679
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/generic.tpl:113
+#: plugins/personal/generic/generic.tpl:131
 msgid "Choose subtree to place user in"
 msgstr "Wählen Sie den Unterbaum, in den der Benutzer eingepflegt werden soll"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
 msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
-#: plugins/personal/generic/generic.tpl:129
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:147
+#: plugins/personal/generic/generic.tpl:291
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
@@ -1977,83 +2130,81 @@ msgstr "W
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/generic.tpl:133
+#: plugins/personal/generic/generic.tpl:151
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:155
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/generic.tpl:146
+#: plugins/personal/generic/generic.tpl:164
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:156
+#: plugins/personal/generic/generic.tpl:174
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:158
+#: plugins/personal/generic/generic.tpl:176
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:162
+#: plugins/personal/generic/generic.tpl:180
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:163
+#: plugins/personal/generic/generic.tpl:181
 msgid "Edit properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:179
+#: plugins/personal/generic/generic.tpl:197
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:191 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:209 html/getxls.php:236
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/generic.tpl:195
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/personal/generic/generic.tpl:213
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:422
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/admin/applications/class_applicationManagement.inc:361
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:424
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:594
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/generic.tpl:217
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:205
+#: plugins/personal/generic/generic.tpl:223
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:211
+#: plugins/personal/generic/generic.tpl:229
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/generic.tpl:227
-#: plugins/personal/generic/generic.tpl:366
+#: plugins/personal/generic/generic.tpl:245
+#: plugins/personal/generic/generic.tpl:384
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:239
+#: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/generic.tpl:243
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2061,70 +2212,71 @@ msgstr "Mobiltelefon"
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:287
 #: plugins/admin/departments/generic.tpl:47 html/getxls.php:174
 #: html/getxls.php:236
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:305
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/generic.tpl:291
+#: plugins/personal/generic/generic.tpl:309
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/generic.tpl:299
+#: plugins/personal/generic/generic.tpl:317
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/generic.tpl:325
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:314
+#: plugins/personal/generic/generic.tpl:332
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/generic.tpl:326
+#: plugins/personal/generic/generic.tpl:344
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:352
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/generic.tpl:341
+#: plugins/personal/generic/generic.tpl:359
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/generic.tpl:365
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/generic.tpl:371
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/generic.tpl:393
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:406
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/personal/generic/generic.tpl:413
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
@@ -2139,23 +2291,11 @@ msgstr ""
 "Passwort an dieser Stelle noch einmal eingeben, damit es von GOsa in der "
 "gewünschten Verschlüsselung abgelegt werden kann."
 
-#: plugins/personal/generic/generic_picture.tpl:23
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
 msgid "Remove picture"
 msgstr "Bild entfernen"
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/systems/servnfs.tpl:75
-#: 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:116
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: include/class_MultiSelectWindow.inc:44
-msgid "Save"
-msgstr "Sichern"
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
@@ -2172,17 +2312,18 @@ msgstr "Standard-Zertifikat"
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:122
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:490
+#: plugins/admin/groups/class_groupMail.inc:538
 #: plugins/admin/applications/class_applicationParameters.inc:100
 #: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/fai/faiPackage.tpl:62
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Entfernen"
@@ -2199,6 +2340,22 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
+msgstr "Benutzer-Einstellungen"
+
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Benutzerbild"
+
+#: plugins/personal/generic/paste_generic.tpl:35
+msgid "Clear password"
+msgstr "Passwort löschen"
+
+#: plugins/personal/generic/paste_generic.tpl:36
+msgid "Set new password"
+msgstr "Neues Passwort setzen"
+
 #: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
 msgstr "FTP Konto"
@@ -2279,6 +2436,15 @@ msgstr "pro"
 msgid "PHPGroupware"
 msgstr "phpGroupware"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#, fuzzy
+msgid "Removing PHPgw account failed"
+msgstr "Nagios-Konto entfernen"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+msgid "Saving PHPgw account failed"
+msgstr "Speichern des PHPgroupware-Kontos fehlgeschlagen"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
@@ -2373,55 +2539,79 @@ msgstr "Manuell"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:232
+#: plugins/personal/connectivity/class_kolabAccount.inc:233
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "Der Wert für Intervall muß eine Ganzzahl sein."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:237
+#: plugins/personal/connectivity/class_kolabAccount.inc:238
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Der Wert für Information URL is ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:252
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:259
+#: plugins/personal/connectivity/class_kolabAccount.inc:260
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
 "Richtlinie!"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:325
+#, fuzzy
+msgid "Saving Kolab account failed"
+msgstr "Kolab-Konto"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#, fuzzy
+msgid "Removing webDAV account failed"
+msgstr "Telefon-Konto entfernen"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#, fuzzy
+msgid "Saving webDAV account failed"
+msgstr "WebDAV-Konto"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#, fuzzy
+msgid "Removing pureftpd account failed"
+msgstr "Telefon-Konto entfernen"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
 msgid "Value specified as 'Files' is not valid."
 msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
 msgid "Value specified as 'Size' is not valid."
 msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+msgid "Saving pureftpd account failed"
+msgstr "Speichern des pureftpd-Kontos fehlgeschlagen"
+
 #: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "WebDAV-Konto"
@@ -2485,28 +2675,57 @@ msgstr ""
 "Dieses Konto besitzt deaktivierte %s-Erweiterungen. Um diese zu aktivieren, "
 "werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert werden."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:791
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:701
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid "Couldn't connect to postgresql database!"
 msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:795
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:705
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:802
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "Nicht alle benötigten Parameter für OpenXchange Konnektivitätserweiterung "
 "wurden gefunden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:806
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "PHP4-Erweiterung für PostgreSQL-Datenbank wurde nicht gefunden!"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+msgid "Removing of oxchange addressbook failed"
+msgstr "Entfernen des oxchange-Adressbuchs fehlgeschlagen"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#, fuzzy
+msgid "Removing oxchange account failed"
+msgstr "Telefon-Konto entfernen"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:785
+msgid ""
+"The Open-Xchange accountname is empty and thus invalid! Check to make sure "
+"that "
+msgstr ""
+"Der Open-Xchange Kontoname ist leer und damit ungültig! Überprüfen Sie Ihre "
+"Angaben."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "you are not using any strange characters in the loginname."
+msgstr "Sie verwenden keine ungewöhnlichen Zeichen im Benutzernamen."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
+msgid "Saving of oxchange account failed"
+msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:826
+msgid "Creating oxchange addressbook tree failed"
+msgstr "Anlegen des oxchange-Adressbuch-Baums fehlgeschlagen"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
+#: plugins/personal/connectivity/class_connectivity.inc:65
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
 
@@ -2524,7 +2743,7 @@ msgid "GB"
 msgstr "GB"
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:299
+#: plugins/addons/mailqueue/class_mailqueue.inc:314
 msgid "hour"
 msgstr "Stunde"
 
@@ -2540,15 +2759,25 @@ msgstr "Woche"
 msgid "month"
 msgstr "Monat"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:171
+#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#, fuzzy
+msgid "Removing proxy account failed"
+msgstr "UNIX-Konto entfernen"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Numerical value for Quota Setting is empty."
 msgstr "Das numerische Feld der Kontingent-Einstellung ist leer."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:174
+#: plugins/personal/connectivity/class_proxyAccount.inc:175
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#, fuzzy
+msgid "Saving proxy account failed"
+msgstr "Proxy Konto"
+
 #: plugins/personal/connectivity/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP-Konto"
@@ -2557,6 +2786,16 @@ msgstr "PPTP-Konto"
 msgid "Intranet"
 msgstr "Intranet"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#, fuzzy
+msgid "Removing intranet account failed"
+msgstr "Netatalk-Konto entfernen"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#, fuzzy
+msgid "Saving intranet account failed"
+msgstr "Intranet-Konto"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "GLPI-Konto"
@@ -2565,6 +2804,16 @@ msgstr "GLPI-Konto"
 msgid "PPTP"
 msgstr "PPTP"
 
+#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#, fuzzy
+msgid "Removing PPTP account failed"
+msgstr "Nagios-Konto entfernen"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#, fuzzy
+msgid "Saving PPTP account failed"
+msgstr "PPTP-Konto"
+
 #: plugins/personal/connectivity/opengw.tpl:1
 msgid "Opengroupware"
 msgstr "Opengroupware"
@@ -2578,11 +2827,12 @@ msgid "Template user"
 msgstr "Benutzer-Vorlage"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:92
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: plugins/personal/connectivity/opengw.tpl:64
+#: plugins/personal/connectivity/opengw.tpl:49
 msgid "Teams"
 msgstr "Teams"
 
@@ -2594,6 +2844,16 @@ msgstr "PHPscheduleit-Konto"
 msgid "PHPscheduleit"
 msgstr "PHPscheduleit"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#, fuzzy
+msgid "Removing PHPscheduleit account failed"
+msgstr "PHPscheduleit-Konto"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#, fuzzy
+msgid "Saving PHPscheduleit account failed"
+msgstr "PHPscheduleit-Konto"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Opengroupware-Konto"
@@ -2623,8 +2883,8 @@ msgid "The environment extension is currently disabled."
 msgstr "Die Umgebungs-Erweiterung ist zur Zeit deaktiviert."
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:102
-#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/environment.tpl:150
 msgid "Environment managment settings"
 msgstr "Umgebungs-Einstellungen"
 
@@ -2664,62 +2924,57 @@ msgstr "Kiosk-Profil"
 msgid "Manage"
 msgstr "Verwalten"
 
-#: plugins/personal/environment/environment.tpl:81
-msgid "Resolution changeable on runtime"
-msgstr "Auflösung änderbar während Betrieb"
+#: plugins/personal/environment/environment.tpl:82
+msgid "Resolution changeable during session"
+msgstr "Auflösung änderbar während des Betriebs"
 
-#: plugins/personal/environment/environment.tpl:86
+#: plugins/personal/environment/environment.tpl:87
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/environment.tpl:106
 #: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Shares"
 msgstr "Freigaben"
 
-#: plugins/personal/environment/environment.tpl:118
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Mount-Pfad"
-
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:128
 msgid "Logon scripts"
 msgstr "Anmelde-Skripte"
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:129
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "Verwaltung der Anmelde-Skripte"
 
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:153
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:154
 msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:367
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/personal/environment/environment.tpl:165
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
 msgstr "Neu"
 
-#: plugins/personal/environment/environment.tpl:165
+#: plugins/personal/environment/environment.tpl:166
 msgid "Existing"
 msgstr "Vorhanden"
 
-#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/environment.tpl:174
 msgid "Printer settings"
 msgstr "Drucker-Einstellungen"
 
-#: plugins/personal/environment/environment.tpl:183
+#: plugins/personal/environment/environment.tpl:184
 msgid "Admin Toggle"
 msgstr "Administrator an/aus"
 
@@ -2727,30 +2982,30 @@ msgstr "Administrator an/aus"
 msgid "User environment settings"
 msgstr "Einstellungen der Benutzer-Umgebung"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
+#: plugins/personal/environment/class_hotplugDialog.inc:113
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Bitte geben Sie einen gültigen Namen ein (0-9 und a-z sind erlaubt)."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:114
+#: plugins/personal/environment/class_hotplugDialog.inc:116
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 "Ungültiges Zeichen im Feld 'Beschreibung'. Bitte geben Sie eine gültige "
 "Beschreibung ein."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:117
+#: plugins/personal/environment/class_hotplugDialog.inc:119
 msgid "Please specify a valid id."
 msgstr "Bitte geben Sie eine gültige ID ein!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:123
+#: plugins/personal/environment/class_hotplugDialog.inc:125
 msgid "An Entry with this name already exists."
 msgstr "Ein Eintrag mit diesem Namen existiert bereits."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:128
+#: plugins/personal/environment/class_hotplugDialog.inc:130
 msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
 
@@ -2771,8 +3026,8 @@ msgid "Choose the department the search will be based    on"
 msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/groups/group_objects.tpl:38
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/groups/group_objects.tpl:46
+#: plugins/admin/users/class_divListUsers.inc:72
 #: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
@@ -2782,34 +3037,34 @@ msgstr "Zeige die Benutzer, auf die Folgendes passt"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Regulärer Ausdruck zum Erkennen von Hotplug-Geräten"
 
-#: plugins/personal/environment/class_environment.inc:251
-#: plugins/personal/environment/class_environment.inc:288
+#: plugins/personal/environment/class_environment.inc:255
+#: plugins/personal/environment/class_environment.inc:292
 msgid "Remove environment extension"
 msgstr "Umgebungs-Erweiterung entfernen"
 
-#: plugins/personal/environment/class_environment.inc:252
-#: plugins/personal/environment/class_environment.inc:289
+#: plugins/personal/environment/class_environment.inc:256
+#: plugins/personal/environment/class_environment.inc:293
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Dieses Konto besitzt aktivierte Umgebungs-Erweiterungen. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/personal/environment/class_environment.inc:261
-#: plugins/personal/environment/class_environment.inc:266
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:265
+#: plugins/personal/environment/class_environment.inc:270
+#: plugins/personal/environment/class_environment.inc:298
+#: plugins/personal/environment/class_environment.inc:303
 msgid "Add environment extension"
 msgstr "Umgebungs-Erweiterung hinzufügen"
 
-#: plugins/personal/environment/class_environment.inc:262
-#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:266
+#: plugins/personal/environment/class_environment.inc:299
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Aktuell besitzt dieses Konto keine aktivierten Umgebungs-Erweiterungen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:267
-#: plugins/personal/environment/class_environment.inc:300
+#: plugins/personal/environment/class_environment.inc:271
+#: plugins/personal/environment/class_environment.inc:304
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -2818,27 +3073,41 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:379
+#: plugins/personal/environment/class_environment.inc:383
 msgid "auto"
 msgstr "auto"
 
-#: plugins/personal/environment/class_environment.inc:411
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/personal/environment/class_environment.inc:416
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "keine"
 
-#: plugins/personal/environment/class_environment.inc:507
+#: plugins/personal/environment/class_environment.inc:421
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+"Das ausgewählte Kiosk-Profil '%s' ist nicht mehr verfügbar, die Einstellung "
+"wurde auf 'keins' zurückgesetzt."
+
 #: plugins/personal/environment/class_environment.inc:517
-#: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:396
+#: plugins/personal/environment/class_environment.inc:528
+#: plugins/admin/systems/class_terminalStartup.inc:156
+#: plugins/admin/systems/class_workstationStartup.inc:533
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:752
+#: plugins/personal/environment/class_environment.inc:716
+#, fuzzy
+msgid "Removing environment information failed"
+msgstr "Umgebungs-Erweiterung entfernen"
+
+#: plugins/personal/environment/class_environment.inc:769
 msgid "Please set a valid profile quota size."
 msgstr "Bitte wählen Sie eine gültige Kontingent-Grösse."
 
-#: plugins/personal/environment/class_environment.inc:759
+#: plugins/personal/environment/class_environment.inc:776
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -2846,21 +3115,26 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:796
+#: plugins/personal/environment/class_environment.inc:814
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Das neue Kiosk-Profil kann nicht gespeichert werden. Wahrscheinlich besitzen "
 "Sie nicht die nötigen Rechte."
 
-#: plugins/personal/environment/class_environment.inc:890
+#: plugins/personal/environment/class_environment.inc:908
 msgid "Error while writing printer"
 msgstr "Fehler beim Speichern des Druckers"
 
-#: plugins/personal/environment/class_environment.inc:961
+#: plugins/personal/environment/class_environment.inc:978
 msgid "Error while writing printer settings"
 msgstr "Fehler beim Speichern der Drucker-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1075
+#: plugins/personal/environment/class_environment.inc:1047
+#, fuzzy
+msgid "Adding environment information failed"
+msgstr "Umgebungs-Erweiterung hinzufügen"
+
+#: plugins/personal/environment/class_environment.inc:1090
 msgid "Admin"
 msgstr "Administrator"
 
@@ -2882,11 +3156,11 @@ msgstr "Zeige die Drucker, auf die Folgendes passt"
 msgid "Regular expression for matching printer names"
 msgstr "Regulärer Ausdruck zum Erkennen von Druckernamen"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
 msgid "Specified name is invalid."
 msgstr "Der angegebene Name ist ungültig."
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
 msgid "Specified description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
@@ -2900,10 +3174,11 @@ msgstr "Skriptname"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -2947,7 +3222,7 @@ msgstr "Anmelde-Skript"
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/fai/faiProfileEntry.tpl:70
@@ -2957,7 +3232,7 @@ msgstr "Anmelde-Skript"
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiNewBranch.tpl:17
+#: plugins/admin/fai/faiNewBranch.tpl:19
 msgid "Apply"
 msgstr "Anwenden"
 
@@ -3007,10 +3282,6 @@ msgstr "Ger
 msgid "Device ID"
 msgstr "Geräte ID"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-msgid "save"
-msgstr "Sichern"
-
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -3023,14 +3294,14 @@ msgid "Browse"
 msgstr "Durchsuchen"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpiManufacturer.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:69
 msgid "Close"
 msgstr "Schliessen"
 
@@ -3043,7 +3314,7 @@ msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:39 html/getxls.php:174
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
@@ -3131,43 +3402,119 @@ msgstr ""
 "Dieses Konto besitzt keine aktivierten Nagios-Erweiterungen. Sie können "
 "diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#, fuzzy
+msgid "Saving nagios account failed"
+msgstr "Neues Nagios-Konto erzeugen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
+#, fuzzy
+msgid "Removing nagios account failed"
+msgstr "Nagios-Konto entfernen"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Liste der Sperrlisten"
+#: plugins/personal/netatalk/main.inc:104
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Speichern"
 
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr "Netatalk-Einstellungen"
+
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr "Netatalk-Konto verwalten"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+msgid "This account has no netatalk extensions."
+msgstr "Dieses Konto hat keine Netatalk-Erweiterungen."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid "Remove netatalk account"
+msgstr "Netatalk-Konto entfernen"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
 msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Dieses Menü ermöglicht es Ihnen, Sperrlisten hinzuzufügen, zu bearbeiten "
-"oder zu entfernen. Bei einer großen Anzahl von Sperrlisten bietet sich die "
-"Verwendung der Bereichswahl an."
+"Dieses Konto hat die Netatalk-Erweiterungen aktiviert. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Auswahl zum Ansehen der Sperrlisten für abgehende Rufe"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
+msgstr "Neues Netatalk-Konto erzeugen"
 
-#: plugins/gofax/blocklists/headpage.tpl:38
+#: plugins/personal/netatalk/class_netatalk.inc:144
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat keine Netatalk-Erweiterungen. Sie können diese aktivieren, "
+"wenn Sie auf die untere Schaltfläche klicken."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr "Sie müssen eine zu verwendende Freigabe auswählen."
+
+#: plugins/personal/netatalk/class_netatalk.inc:256
+#, fuzzy
+msgid "Saving Netatalk account failed"
+msgstr "Netatalk-Konto verwalten"
+
+#: plugins/personal/netatalk/class_netatalk.inc:316
+#, fuzzy
+msgid "Removing Netatalk account failed"
+msgstr "Netatalk-Konto entfernen"
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr "Freigabe"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Pfad"
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Liste der Sperrlisten"
+
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Dieses Menü ermöglicht es Ihnen, Sperrlisten hinzuzufügen, zu bearbeiten "
+"oder zu entfernen. Bei einer großen Anzahl von Sperrlisten bietet sich die "
+"Verwendung der Bereichswahl an."
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Auswahl zum Ansehen der Sperrlisten für abgehende Rufe"
+
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Show send blocklists"
 msgstr "Zeige Sperrlisten für abgehende Rufe"
 
@@ -3185,7 +3532,7 @@ msgstr "Zeige die Sperrlisten, auf die Folgendes passt"
 
 #: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Sperrlisten-Namen"
+msgstr "Regulärer Ausdruck zum Erkennen von Sperrlisten-Namen"
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -3200,7 +3547,7 @@ msgid "Select subtree to place blocklist in"
 msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
 
 #: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/servnfs.tpl:47
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
@@ -3209,7 +3556,8 @@ msgstr "W
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiSummaryTab.inc:300
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr "Typ"
@@ -3234,251 +3582,302 @@ msgstr "Nummern k
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
 #, 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:241
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:247
 msgid "You have no permission to remove this blocklist."
 msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:257
 msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/admin/groups/class_divListGroup.inc:94
+#: plugins/admin/users/class_divListUsers.inc:99
+#: plugins/admin/applications/class_applicationManagement.inc:445
+#: plugins/admin/departments/class_departmentManagement.inc:320
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:88
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
-msgstr "Eine Abteilung nach oben"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:450
+#: plugins/admin/fai/class_faiManagement.inc:642
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:283
+msgid "Go to root department"
+msgstr "Gehe zur Wurzel-Abteilung"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/groups/class_divListGroup.inc:94
+#: plugins/admin/users/class_divListUsers.inc:99
+#: plugins/admin/applications/class_applicationManagement.inc:445
+#: plugins/admin/departments/class_departmentManagement.inc:320
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:88
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/admin/fai/class_faiProfile.inc:286
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr "Auf"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:642
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:283
+msgid "Root"
+msgstr "Wurzel"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/admin/groups/class_divListGroup.inc:95
+#: plugins/admin/users/class_divListUsers.inc:101
+#: plugins/admin/applications/class_applicationManagement.inc:446
+#: plugins/admin/departments/class_departmentManagement.inc:321
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_divListSystem.inc:90
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
-msgstr "Gehe zur Wurzel-Abteilung"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/fai/class_faiManagement.inc:645
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Go up one department"
+msgstr "Eine Abteilung nach oben"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/groups/class_divListGroup.inc:95
+#: plugins/admin/users/class_divListUsers.inc:101
+#: plugins/admin/applications/class_applicationManagement.inc:446
+#: plugins/admin/departments/class_departmentManagement.inc:321
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_divListSystem.inc:90
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
-msgstr "Wurzel"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/fai/class_faiManagement.inc:645
+#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Up"
+msgstr "Auf"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
+#: plugins/admin/groups/class_divListGroup.inc:96
+#: plugins/admin/users/class_divListUsers.inc:103
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
+#: plugins/admin/groups/class_divListGroup.inc:96
+#: plugins/admin/users/class_divListUsers.inc:103
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/departments/class_departmentManagement.inc:322
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/fai/class_faiManagement.inc:638
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/ogroups/class_ogroupManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Home"
 msgstr "Heimat"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/admin/groups/class_divListGroup.inc:97
+#: plugins/admin/users/class_divListUsers.inc:105
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/departments/class_departmentManagement.inc:323
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:93
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:650
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+msgid "Reload list"
+msgstr "Liste neu laden"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:97
+#: plugins/admin/groups/class_divListGroup.inc:103
+#: plugins/admin/users/class_divListUsers.inc:105
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
+#: plugins/admin/departments/class_departmentManagement.inc:323
+#: plugins/admin/departments/class_departmentManagement.inc:328
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:93
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:455
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: plugins/admin/fai/class_faiManagement.inc:650
+#: plugins/admin/fai/class_faiManagement.inc:680
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+msgid "Submit"
+msgstr "Übertragen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 msgid "New Blocklist"
 msgstr "Neue Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/admin/fai/class_faiManagement.inc:668
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:103
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/class_applicationManagement.inc:454
+#: plugins/admin/departments/class_departmentManagement.inc:328
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: plugins/admin/fai/class_faiManagement.inc:680
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/admin/fai/class_faiManagement.inc:668
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr "Übertragen"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:780
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/admin/groups/class_divListGroup.inc:151
+#: plugins/admin/users/class_divListUsers.inc:149
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/departments/class_departmentManagement.inc:335
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/class_faiScript.inc:206
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/fai/class_faiHook.inc:229
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/ogroups/class_ogroupManagement.inc:473
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/admin/users/class_divListUsers.inc:150
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/admin/fai/class_faiScript.inc:207
-#: plugins/admin/fai/class_faiManagement.inc:687
-#: plugins/admin/fai/class_faiHook.inc:230
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_divListGroup.inc:153
+#: plugins/admin/users/class_divListUsers.inc:153
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/ogroups/class_ogroupManagement.inc:475
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
+#: plugins/admin/fai/class_faiManagement.inc:699
+#: plugins/admin/fai/class_faiManagement.inc:805
+#: plugins/admin/fai/class_faiHook.inc:256
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/admin/users/class_divListUsers.inc:154
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 msgid "Blocklist name"
 msgstr "Name der Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:424
-#: plugins/admin/users/class_userManagement.inc:699
-#: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/groups/class_divListGroup.inc:52
+#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/applications/class_applicationManagement.inc:495
+#: plugins/admin/departments/class_departmentManagement.inc:343
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:401
-#: plugins/admin/fai/class_faiManagement.inc:683
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_divListSystem.inc:53
+#: plugins/admin/ogroups/class_ogroupManagement.inc:503
+#: plugins/admin/fai/class_faiManagement.inc:695
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Actions"
 msgstr "Aktionen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:334
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Diese Tabelle enthält Sperrlisten des ausgewählten Unterbaums."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:518
+msgid "Removing blocklist object failed"
+msgstr "Entfernen des Blocklisten-Objekts fehlgeschlagen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:554
 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:548
-#: plugins/admin/departments/class_departmentGeneric.inc:190
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:560
+#: plugins/admin/departments/class_departmentGeneric.inc:232
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
 "anzulegen."
 
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:625
+msgid "Saving blocklist object failed"
+msgstr "Speichern des Blocklisten-Objekts fehlgeschlagen"
+
 #: 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
@@ -3486,9 +3885,9 @@ msgstr ""
 #: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/admin/fai/remove.tpl:2 plugins/admin/fai/remove_branch.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:236 html/index.php:296 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6
+#: html/index.php:244 html/index.php:250 html/index.php:308
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr "Warnung"
 
@@ -3516,6 +3915,7 @@ msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 msgid "Fax number for GOfax to trigger on"
 msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
 
@@ -3587,7 +3987,7 @@ msgstr "Zeige die Nummern, auf die Folgendes passt"
 
 #: plugins/gofax/faxaccount/locals.tpl:41
 msgid "Regular expression for matching numbers"
-msgstr "Regulärer Ausdruck zum Abgleich mit Telefonnummern"
+msgstr "Regulärer Ausdruck zum Erkennen von Telefonnummern"
 
 #: plugins/gofax/faxaccount/locals.tpl:47
 msgid "Display numbers of user"
@@ -3652,32 +4052,37 @@ msgstr ""
 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:513
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:515
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
+#: plugins/admin/groups/class_groupApplication.inc:641
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "zurück"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:625
+#, fuzzy
+msgid "Removing FAX account failed"
+msgstr "Nagios-Konto entfernen"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "The required field 'Fax' is not set."
 msgstr "Das benötigte Feld 'Fax' ist nicht gesetzt."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
 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:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
 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:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
 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:659
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3685,6 +4090,10 @@ 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:744
+msgid "Saving FAX account failed"
+msgstr "Speichern des FAX-Kontos fehlgeschlagen"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3731,8 +4140,8 @@ msgstr "Suchen"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:671
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_printGeneric.inc:751
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr "Benutzer"
@@ -3851,7 +4260,7 @@ msgid "Y-M-D"
 msgstr "D.M.Y"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/class_addressbook.inc:514
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/systems/servnfs.tpl:9
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
@@ -3880,6 +4289,7 @@ msgstr "D.M.Y"
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:295
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Name"
@@ -3909,7 +4319,7 @@ msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:597
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Eintrag bearbeiten"
 
@@ -3954,10 +4364,10 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
+#: plugins/addons/addressbook/class_addressbook.inc:361
+#: plugins/addons/addressbook/class_addressbook.inc:368
+#: plugins/addons/addressbook/class_addressbook.inc:372
+#: plugins/addons/addressbook/class_addressbook.inc:454
 msgid "Dial"
 msgstr "Wähle"
 
@@ -4034,88 +4444,98 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#, fuzzy
+msgid "Removing addressbook entry failed"
+msgstr "Zeige Adressbuch-Einträge"
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Sie löschen gerade den Eintrag %s."
 
-#: plugins/addons/addressbook/class_addressbook.inc:377
+#: plugins/addons/addressbook/class_addressbook.inc:378
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:381
+#: plugins/addons/addressbook/class_addressbook.inc:382
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:466
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:468
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:473
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:475
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/class_addressbook.inc:514
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:281
-#: plugins/addons/mailqueue/class_mailqueue.inc:346
+#: plugins/addons/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:361
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:514 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Vorname"
 
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:515
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:515
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:516 html/getxls.php:174
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
+#: plugins/addons/addressbook/class_addressbook.inc:516 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/addons/addressbook/class_addressbook.inc:598
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "bitte weitere Felder aus."
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:606
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Sie haben keine Berechtigung, einen Eintrag unterhalb dieser 'Basis' "
 "anzulegen."
 
+#: plugins/addons/addressbook/class_addressbook.inc:651
+#, fuzzy
+msgid "Saving addressbook entry failed"
+msgstr "Zeige Adressbuch-Einträge"
+
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
@@ -4504,7 +4924,7 @@ msgid "Error"
 msgstr "Fehler"
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:349
+#: plugins/addons/mailqueue/class_mailqueue.inc:364
 msgid "Active"
 msgstr "Aktiv"
 
@@ -4549,112 +4969,170 @@ msgstr "Zeige Kopfzeilen dieser Nachricht"
 msgid "Mail queue"
 msgstr "Mail-Warteschlange"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:53
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
 msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
-"specified."
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
-"Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag "
-"'MAILQUEUE_QUERY_COMMAND' wurde nicht gefunden."
+"Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag 'MAILQUEUESCRIPTPATH' "
+"wurde nicht gefunden."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:88
-#: plugins/addons/mailqueue/class_mailqueue.inc:107
-#: plugins/addons/mailqueue/class_mailqueue.inc:116
-#: plugins/addons/mailqueue/class_mailqueue.inc:171
-#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#: plugins/addons/mailqueue/class_mailqueue.inc:86
+#: plugins/addons/mailqueue/class_mailqueue.inc:94
+#: plugins/addons/mailqueue/class_mailqueue.inc:113
+#: plugins/addons/mailqueue/class_mailqueue.inc:122
+#: plugins/addons/mailqueue/class_mailqueue.inc:177
+#: plugins/addons/mailqueue/class_mailqueue.inc:204
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 "Bitte überprüfen Sie Ihre 'gosa.conf' - '%s' kann nicht ausgeführt werden."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:251
+#: plugins/addons/mailqueue/class_mailqueue.inc:216
+msgid "There are no mail server specified."
+msgstr "Es wurden keine Mail-Server angegeben."
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:266
 msgid "up"
 msgstr "auf"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:253
+#: plugins/addons/mailqueue/class_mailqueue.inc:268
 msgid "down"
 msgstr "ab"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:311
 msgid "no limit"
 msgstr "keine Beschränkung"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:316
 msgid "hours"
 msgstr "Stunden"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:347
+#: plugins/addons/mailqueue/class_mailqueue.inc:362
 msgid "Hold"
 msgstr "Vorhalten"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:348
+#: plugins/addons/mailqueue/class_mailqueue.inc:363
 msgid "Un hold"
 msgstr "Vorhalten aufheben"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:350
+#: plugins/addons/mailqueue/class_mailqueue.inc:365
 msgid "Not active"
 msgstr "inaktiv"
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Liste der Gruppen"
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+#, fuzzy
+msgid "DFS Managment"
+msgstr "Verwaltung"
 
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Gruppen, hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer großen Anzahl von Gruppen bietet sich die Verwendung "
-"der Bereichsauswahl an."
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+#, fuzzy
+msgid "Removing DFS share failed"
+msgstr "DNS-Dienst entfernen"
 
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
+msgstr "Keine DFS-Einträge gefunden"
 
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Zeige primäre Gruppen"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Eine Abteilung nach oben"
 
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr "Gehe zur DFS-Wurzel"
 
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Zeige Samba-Gruppen"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Auswählen, um die Gruppen zu sehen, denen Anwendungen zugeordnet sind"
+#: plugins/addons/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Die angegebene Kategorie existiert bereits."
 
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Zeige Anwendungs-Gruppen"
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
+#: plugins/addons/godfs/class_dfsgeneric.inc:120
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Eigenschaften"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Name der Abteilung"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Mail-Server"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Parent-Server"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Ort"
+
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr "DFS-Freigaben"
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
 msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen E-Mail-Eigenschaften zugeordnet "
-"sind"
+"Dieses Menü erlaubt es Ihnen, Abteilungen hinzuzufügen, zu bearbeiten oder "
+"zu entfernen. Bei einer Vielzahl von Abteilungen bietet sich die Verwendung "
+"der Bereichswahl an."
 
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Zeige E-Mail-Gruppen"
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
 
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Regulärer Ausdruck zum Erkennen von System-Namen"
 
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Zeige Funktions-Gruppen"
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed File System Administration"
+msgstr "Verteiltes Dateisystem (DFS) Verwaltung"
 
-#: plugins/admin/groups/mail.tpl:11
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
 msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
 
@@ -4674,7 +5152,7 @@ msgstr "Standard-Berechtigungen"
 msgid "Member permission"
 msgstr "Mitglieder-Berechtigungen"
 
-#: plugins/admin/groups/mail.tpl:88
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
@@ -4686,120 +5164,94 @@ msgstr ""
 "Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
 "die Daten nicht wiederherstellen kann."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
+#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:288
+#: plugins/admin/groups/class_groupManagement.inc:244
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
 
-#: plugins/admin/groups/class_groupManagement.inc:294
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:250
+#: plugins/admin/groups/class_groupManagement.inc:281
 msgid "You are not allowed to delete this group!"
 msgstr "Sie haben keine Berechtigung, diese Gruppe zu löschen!"
 
-#: plugins/admin/groups/class_groupManagement.inc:367
-msgid "Create new group"
-msgstr "Neue Gruppe erstellen"
-
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
-
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
-
-#: plugins/admin/groups/class_groupManagement.inc:398
-#: plugins/admin/users/class_userManagement.inc:735
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/admin/groups/class_groupManagement.inc:407
-#: plugins/admin/applications/class_applicationManagement.inc:352
-#: plugins/admin/ogroups/class_ogroupManagement.inc:491
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Anwendung"
-
-#: plugins/admin/groups/class_groupManagement.inc:422
-msgid "Groupname"
-msgstr "Name der Gruppe"
-
-#: plugins/admin/groups/class_groupManagement.inc:423
-#: plugins/admin/users/class_userManagement.inc:698
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/gofon/conference/generic.tpl:4
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: plugins/admin/groups/class_groupManagement.inc:427
-#: plugins/admin/applications/class_applicationManagement.inc:366
-#: plugins/admin/ogroups/class_ogroupManagement.inc:405
-msgid "This table displays all groups, in the selected tree."
-msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
-
-#: plugins/admin/groups/class_groupGeneric.inc:117
+#: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Die SID dieser Gruppe kann weder im LDAP noch in der Konfigurationsdatei "
 "gefunden werden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:169
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:312
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:317
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:650
-#: plugins/admin/ogroups/class_ogroup.inc:655
+#: plugins/admin/groups/class_groupGeneric.inc:434
+msgid "! unknown id"
+msgstr "! unbekannte id"
+
+#: plugins/admin/groups/class_groupGeneric.inc:466
+#, php-format
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
+msgstr ""
+"Ihre Such-Methode ergab mehr als '%s' Benutzer, es werden davon '%s' "
+"Benutzer angezeigt."
+
+#: plugins/admin/groups/class_groupGeneric.inc:495
+msgid "Removing group failed"
+msgstr "Entfernen der Gruppe fehlgeschlagen"
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#, php-format
+msgid "No configured SID found for '%s'."
+msgstr "Keine konfigurierte SID für %s gefunden"
+
+#: plugins/admin/groups/class_groupGeneric.inc:607
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr "Keine konfigurierte RIDBASE für '%s' gefunden."
+
+#: plugins/admin/groups/class_groupGeneric.inc:692
+msgid "Saving group failed"
+msgstr "Speichern der Gruppe fehlgeschlagen"
+
+#: plugins/admin/groups/class_groupGeneric.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:656
 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:660
+#: plugins/admin/groups/class_groupGeneric.inc:731
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -4807,24 +5259,35 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:671
-#: plugins/admin/groups/class_groupGeneric.inc:678
+#: plugins/admin/groups/class_groupGeneric.inc:743
+#: plugins/admin/groups/class_groupGeneric.inc:757
+#: plugins/admin/groups/class_groupGeneric.inc:764
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: plugins/admin/groups/application.tpl:4
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr "Release-Fokus"
+
+#: plugins/admin/groups/application.tpl:5
+msgid "Select release name"
+msgstr "Release-Namen auswählen"
+
+#: plugins/admin/groups/application.tpl:16
 msgid "Used applications"
 msgstr "Verwendete Anwendungen"
 
-#: plugins/admin/groups/application.tpl:7
+#: plugins/admin/groups/application.tpl:19
 msgid "Add category"
 msgstr "Kategorie hinzufügen"
 
-#: plugins/admin/groups/application.tpl:12
+#: plugins/admin/groups/application.tpl:24
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:483
+#: include/class_ldap.inc:454
 msgid "Object"
 msgstr "Objekt"
 
@@ -4837,52 +5300,61 @@ msgstr "W
 msgid "Apply this acl only for users own entries"
 msgstr "Anwenden dieser Zugriffsregel nur auf Einträge des Eigentümers"
 
-#: plugins/admin/groups/class_groupMail.inc:230
+#: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
 msgstr "lesen"
 
-#: plugins/admin/groups/class_groupMail.inc:231
+#: plugins/admin/groups/class_groupMail.inc:279
 msgid "post"
 msgstr "posten"
 
-#: plugins/admin/groups/class_groupMail.inc:232
+#: plugins/admin/groups/class_groupMail.inc:280
 msgid "external post"
 msgstr "extern posten"
 
-#: plugins/admin/groups/class_groupMail.inc:233
+#: plugins/admin/groups/class_groupMail.inc:281
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:234
+#: plugins/admin/groups/class_groupMail.inc:282
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/groups/class_groupMail.inc:259
+#: plugins/admin/groups/class_groupMail.inc:306
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Dieser 'DN' hat keine Mail-Erweiterungen."
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:371
 msgid "You're trying to add an invalid email address "
 msgstr "Sie versuchen, eine ungültige Mail-Adresse hinzuzufügen"
 
-#: plugins/admin/groups/class_groupMail.inc:325
+#: plugins/admin/groups/class_groupMail.inc:372
 msgid "to the list of forwarders."
 msgstr "zur Liste der Weiterleitungen hinzuzufügen."
 
-#: plugins/admin/groups/class_groupMail.inc:822
+#: plugins/admin/groups/class_groupMail.inc:607
+#, fuzzy
+msgid "Removing group mail settings failed"
+msgstr "Benutzer Mail-Einstellungen"
+
+#: plugins/admin/groups/class_groupMail.inc:779
+msgid "Saving group mail settings failed"
+msgstr "Speichern der Mail-Einstellungen für die Gruppe fehlgeschlagen"
+
+#: plugins/admin/groups/class_groupMail.inc:808
 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:855
+#: plugins/admin/groups/class_groupMail.inc:841
 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:859
+#: plugins/admin/groups/class_groupMail.inc:845
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
@@ -4894,11 +5366,13 @@ msgstr "Ordner-Administratoren"
 msgid "Select a specific department"
 msgstr "Wählen Sie eine bestimmte Abteilung"
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
+#: plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:737
 msgid "Group name"
 msgstr "Gruppenname"
 
-#: plugins/admin/groups/generic.tpl:9
+#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
 msgid "Posix name of the group"
 msgstr "UNIX-Name der Gruppe"
 
@@ -4911,15 +5385,18 @@ msgid "Choose subtree to place group in"
 msgstr "Wählen Sie den Unterbaum, in den die Gruppe eingepflegt werden soll"
 
 #: plugins/admin/groups/generic.tpl:37
+#: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
 #: plugins/admin/groups/generic.tpl:37
+#: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Erzwinge GID"
 
 #: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Erzwungene ID-Nummer"
 
@@ -4947,45 +5424,224 @@ msgstr "Gruppenmitglieder"
 msgid "Select users to add"
 msgstr "Wählen Sie die hinzuzufügenden Benutzer"
 
-#: plugins/admin/groups/group_objects.tpl:29
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "Wählen um Server anzuzeigen"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Search within subtree"
+msgstr "Suche im Unterbaum"
+
+#: plugins/admin/groups/group_objects.tpl:37
 msgid "Display users of department"
 msgstr "Zeige die Benutzer der Abteilung"
 
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/groups/group_objects.tpl:47
 #: plugins/admin/systems/glpiSelectUser.tpl:37
 msgid "Regular expression for matching user names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
+msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
 #: plugins/admin/groups/class_groupAcl.inc:59
 msgid "This 'dn' is no acl container."
 msgstr "Diese 'dn' enthält keine Zugriffserweiterungen."
 
-#: plugins/admin/groups/class_groupAcl.inc:207
+#: plugins/admin/groups/class_groupAcl.inc:100
+msgid "Removing ACL information failed"
+msgstr "Entfernen der ACL-Informationen fehlgeschlagen"
+
+#: plugins/admin/groups/class_groupAcl.inc:196
+msgid "Saving ACL information failed"
+msgstr "Speichern der ACL-Informationen fehlgeschlagen"
+
+#: plugins/admin/groups/class_groupAcl.inc:206
 msgid "All fields are writeable"
 msgstr "Alle Felder sind änderbar"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Anwendungsoptionen"
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+#: plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Liste der Gruppen"
 
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
+#: plugins/admin/groups/class_divListGroup.inc:41
+#, fuzzy
+msgid "This menu allows you to add, edit and remove selected groups. "
+msgstr ""
+"Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
+"entfernen und zu bearbeiten."
 
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
+#: plugins/admin/groups/class_divListGroup.inc:42
+#, fuzzy
+msgid ""
+"You may want to use the range selector on top of the group listbox, when "
+"working with a large number of groups."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen, Gruppen hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
-#: plugins/admin/groups/class_groupApplication.inc:295
+#: plugins/admin/groups/class_divListGroup.inc:50
+#, fuzzy
+msgid "Groupname / Department"
+msgstr "Eine Abteilung nach oben"
+
+#: plugins/admin/groups/class_divListGroup.inc:51
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_ogroupManagement.inc:502
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/gofon/conference/generic.tpl:4
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
+
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
+
+#: plugins/admin/groups/class_divListGroup.inc:56
+msgid "Select to see groups that have samba groups mappings"
+msgstr ""
+"Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
+
+#: plugins/admin/groups/class_divListGroup.inc:56
+msgid "Show samba groups"
+msgstr "Zeige Samba-Gruppen"
+
+#: plugins/admin/groups/class_divListGroup.inc:57
+msgid "Select to see groups that have applications configured"
+msgstr "Auswählen, um die Gruppen zu sehen, denen Anwendungen zugeordnet sind"
+
+#: plugins/admin/groups/class_divListGroup.inc:57
+msgid "Show application groups"
+msgstr "Zeige Anwendungs-Gruppen"
+
+#: plugins/admin/groups/class_divListGroup.inc:58
+msgid "Select to see groups that have mail settings"
+msgstr ""
+"Auswählen, um die Gruppen zu sehen, denen E-Mail-Eigenschaften zugeordnet "
+"sind"
+
+#: plugins/admin/groups/class_divListGroup.inc:58
+msgid "Show mail groups"
+msgstr "Zeige E-Mail-Gruppen"
+
+#: plugins/admin/groups/class_divListGroup.inc:59
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
+
+#: plugins/admin/groups/class_divListGroup.inc:59
+msgid "Show functional groups"
+msgstr "Zeige Funktions-Gruppen"
+
+#: plugins/admin/groups/class_divListGroup.inc:63
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:66
+#, fuzzy
+msgid "Select to search within subtrees"
+msgstr "Suche im Unterbaum"
+
+#: plugins/admin/groups/class_divListGroup.inc:63
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Ignore subtrees"
+msgstr "Ignoriere Unterbäume"
+
+#: plugins/admin/groups/class_divListGroup.inc:99
+msgid "Create new group"
+msgstr "Neue Gruppe erstellen"
+
+#: plugins/admin/groups/class_divListGroup.inc:127
+#: plugins/admin/users/class_divListUsers.inc:168
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_divListGroup.inc:133
+#: plugins/admin/applications/class_applicationManagement.inc:485
+#: plugins/admin/ogroups/class_ogroupManagement.inc:593
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Anwendung"
+
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/applications/class_applicationManagement.inc:461
+#: plugins/admin/ogroups/class_ogroupManagement.inc:469
+msgid "cut"
+msgstr "Ausschneiden"
+
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/applications/class_applicationManagement.inc:461
+#: plugins/admin/ogroups/class_ogroupManagement.inc:469
+msgid "Cut this entry"
+msgstr "Diesen Eintrag ausschneiden"
+
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/applications/class_applicationManagement.inc:463
+#: plugins/admin/ogroups/class_ogroupManagement.inc:471
+msgid "copy"
+msgstr "Kopieren"
+
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/applications/class_applicationManagement.inc:463
+#: plugins/admin/ogroups/class_ogroupManagement.inc:471
+msgid "Copy this entry"
+msgstr "Diesen Eintrag kopieren"
+
+#: plugins/admin/groups/class_divListGroup.inc:151
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/departments/class_departmentManagement.inc:335
+#: plugins/admin/ogroups/class_ogroupManagement.inc:473
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+msgid "Edit this entry"
+msgstr "Diesen Eintrag bearbeiten"
+
+#: plugins/admin/groups/class_divListGroup.inc:153
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/ogroups/class_ogroupManagement.inc:475
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+msgid "Delete this entry"
+msgstr "Diesen Eintrag entfernen"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Anwendungsoptionen"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
+#: plugins/admin/groups/class_groupApplication.inc:394
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:304
+#: plugins/admin/groups/class_groupApplication.inc:403
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -4993,11 +5649,11 @@ msgstr ""
 "Diese Gruppe hat Anwendungs-Eigenschaften aktiviert. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:307
+#: plugins/admin/groups/class_groupApplication.inc:406
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5005,116 +5661,92 @@ msgstr ""
 "Diese Gruppe besitzt deaktivierte Anwendungs-Eigenschaften. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/groups/class_groupApplication.inc:319
+#: plugins/admin/groups/class_groupApplication.inc:418
 msgid "Invalid character in category name."
 msgstr "Die angegebene Kategorie enthält ungültige Zeichen."
 
-#: plugins/admin/groups/class_groupApplication.inc:327
+#: plugins/admin/groups/class_groupApplication.inc:426
 msgid "The specified category already exists."
 msgstr "Die angegebene Kategorie existiert bereits."
 
-#: plugins/admin/groups/class_groupApplication.inc:393
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Der gewählte Anwendungsname ist nicht eindeutig. Bitte überprüfen Sie Ihr "
 "LDAP-Verzeichnis."
 
-#: plugins/admin/groups/class_groupApplication.inc:429
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
-#: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/fai/class_faiManagement.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:647
+#: plugins/admin/departments/class_departmentManagement.inc:359
+#: plugins/admin/fai/class_faiManagement.inc:719
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/groups/class_groupApplication.inc:529
+#: plugins/admin/groups/class_groupApplication.inc:655
 msgid "application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupApplication.inc:560
-#: plugins/admin/groups/class_groupApplication.inc:596
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Delete entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:564
-#: plugins/admin/groups/class_groupApplication.inc:594
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:565
-#: plugins/admin/groups/class_groupApplication.inc:595
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr "Feldtrenner einfügen"
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Liste der Benutzer"
+#: plugins/admin/groups/class_groupApplication.inc:746
+msgid "This application is no longer available."
+msgstr "Diese Applikation ist nicht mehr verfügbar."
 
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen, Benutzer hinzuzufügen, zu bearbeiten oder "
-"zu entfernen. Bei einer großen Anzahl von Benutzern bietet sich die "
-"Verwendung der Bereichsauswahl an."
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Wählen Sie dies, um Vorlagen für Benutzer anzuzeigen"
-
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:72
-msgid "Show templates"
-msgstr "Zeige Vorlagen"
+#: plugins/admin/groups/class_groupApplication.inc:749
+#, php-format
+msgid "This application is not available in any release named %s."
+msgstr "Diese Applikation ist im Release '%s' nicht verfügbar."
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Auswählen, um die Benutzer anzuzeigen, die nur ein GOsa-Objekt haben"
+#: plugins/admin/groups/class_groupApplication.inc:753
+msgid "Check parameter"
+msgstr "Überprüfe Parameter"
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Zeige zweckbezogene Benutzer"
+#: plugins/admin/groups/class_groupApplication.inc:755
+msgid "This application has changed parameters."
+msgstr "Diese Applikation hat veränderte Parameter."
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Auswählen, um die Benutzer mit UNIX-Konto zu sehen"
+#: plugins/admin/groups/class_groupApplication.inc:841
+#, fuzzy
+msgid "Removing application information failed"
+msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Zeige UNIX-Benutzer"
+#: plugins/admin/groups/class_groupApplication.inc:885
+#, fuzzy
+msgid "Saving application information failed"
+msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: plugins/admin/groups/class_groupApplication.inc:927
+#, php-format
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
 msgstr ""
-"Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Zeige Mail-Benutzer"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Auswählen, um die Benutzer zu sehen, die SAMBA-Einstellungen besitzen"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Zeige SAMBA-Benutzer"
-
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Auswählen, um die Benutzer zu sehen, die Proxy-Einstellungen besitzen"
+"Der Release-Name '%s' kann nicht aufgelöst werden. Nehme '%s' als neuen "
+"Release-Namen an."
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Zeige Proxy-Benutzer"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Gruppen-Einstellungen"
 
 #: plugins/admin/users/remove.tpl:6
 msgid ""
@@ -5136,159 +5768,229 @@ msgstr ""
 "Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
 "Benutzer ohne dieses Passwort nicht anmelden kann."
 
-#: plugins/admin/users/class_userManagement.inc:25
+#: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:66
 #: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
 #: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:254
-#: plugins/admin/users/class_userManagement.inc:324
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
 msgid "You are not allowed to set this users password!"
 msgstr "Sie haben keine Berechtigung, das Passwort dieses Benutzers zu setzen!"
 
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:312
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Sie löschen gerade den Benutzer %s."
 
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:345
 msgid "You are not allowed to delete this user!"
 msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen!"
 
-#: plugins/admin/users/class_userManagement.inc:495
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
+#: plugins/admin/users/class_userManagement.inc:451
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:566
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Erzeugen eines neuen Benutzer aus einer Vorlage"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen "
+"vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
+"ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
+
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:735
+msgid "Template"
+msgstr "Vorlage"
+
+#: plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:417
+#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/systems/SelectDeviceType.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:612
+#: plugins/admin/fai/faiPackageNew.tpl:50
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+msgid "User administration"
+msgstr "Benutzerverwaltung"
+
+#: plugins/admin/users/class_divListUsers.inc:41
+#: plugins/admin/users/class_divListUsers.inc:42
+#: plugins/admin/systems/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Liste der Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:46
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"Dieses Menü ermöglicht es Ihnen, Benutzer hinzuzufügen, zu bearbeiten oder "
+"zu entfernen. Bei einer großen Anzahl von Benutzern bietet sich die "
+"Verwendung der Bereichsauswahl an."
+
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22
+msgid "Username"
+msgstr "Benutzername"
+
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
+msgstr "Wählen Sie dies, um Vorlagen für Benutzer anzuzeigen"
+
+#: plugins/admin/users/class_divListUsers.inc:60
+#: plugins/admin/fai/headpage.tpl:72
+msgid "Show templates"
+msgstr "Zeige Vorlagen"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+#, fuzzy
+msgid "Select to see users that   have only a GOsa object"
+msgstr "Auswählen, um die Benutzer anzuzeigen, die nur ein GOsa-Objekt haben"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
+msgstr "Zeige zweckbezogene Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
+msgstr "Auswählen, um die Benutzer mit UNIX-Konto zu sehen"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
+msgstr "Zeige UNIX-Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
+msgstr ""
+"Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
+msgstr "Zeige Mail-Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
+msgstr "Auswählen, um die Benutzer zu sehen, die SAMBA-Einstellungen besitzen"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
+msgstr "Zeige SAMBA-Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
+msgstr "Auswählen, um die Benutzer zu sehen, die Proxy-Einstellungen besitzen"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
+msgstr "Zeige Proxy-Benutzer"
+
+#: plugins/admin/users/class_divListUsers.inc:108
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_divListUsers.inc:108
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_divListUsers.inc:110
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_divListUsers.inc:110
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/users/class_divListUsers.inc:151
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
-msgid "Username"
-msgstr "Benutzername"
-
-#: plugins/admin/users/class_userManagement.inc:702
-msgid "This table displays all users, in the selected tree."
-msgstr "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
-
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/users/class_divListUsers.inc:166
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:734
+#: plugins/admin/users/class_divListUsers.inc:167
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/users/class_divListUsers.inc:169
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_divListUsers.inc:171
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:740
+#: plugins/admin/users/class_divListUsers.inc:173
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_divListUsers.inc:175
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_divListUsers.inc:177
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_divListUsers.inc:179
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/admin/users/class_divListUsers.inc:181
+msgid "Edit netatalk properties"
+msgstr "Netatalk-Einstellungen bearbeiten"
+
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:748
+#: plugins/admin/users/class_divListUsers.inc:183
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_divListUsers.inc:236
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:814
+#: plugins/admin/users/class_divListUsers.inc:243
 msgid "Offline"
 msgstr "inaktiv"
 
-#: plugins/admin/users/class_userManagement.inc:1041
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Vorlage"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Erzeugen eines neuen Benutzer aus einer Vorlage"
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen "
-"vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
-"ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
-
-#: plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:602
-#: plugins/admin/fai/faiPackageNew.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Benutzerverwaltung"
-
 #: plugins/admin/applications/headpage.tpl:6
 msgid "List of applications"
 msgstr "Liste der Anwendungen"
@@ -5303,17 +6005,28 @@ msgstr ""
 "oder zu entfernen. Bei einer großen Anzahl von Anwendungen bietet sich die "
 "Verwendung der Bereichsauswahl an."
 
-#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:30
+#: plugins/admin/fai/headpage.tpl:29
+msgid "Branches"
+msgstr "Zweige"
+
+#: plugins/admin/applications/headpage.tpl:36
+#: plugins/admin/fai/headpage.tpl:35
+msgid "Current release"
+msgstr "Momentanes Release"
+
+#: plugins/admin/applications/headpage.tpl:56
 msgid "Display applications matching"
 msgstr "Zeige die Anwendungen, auf die das Folgende passt"
 
-#: plugins/admin/applications/headpage.tpl:41
+#: plugins/admin/applications/headpage.tpl:59
 msgid "Regular expression for matching application names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Anwendungsnamen"
+msgstr "Regulärer Ausdruck zum Erkennen von Anwendungsnamen"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:361
+#: plugins/admin/applications/class_applicationGeneric.inc:420
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -5323,12 +6036,13 @@ msgid "Display name"
 msgstr "Angezeigter Name"
 
 #: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:425
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5342,39 +6056,39 @@ msgstr "Pfad und/oder Name der Anwendung"
 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:48
+#: plugins/admin/applications/generic.tpl:49
 msgid "Icon"
 msgstr "Symbol"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:57
 msgid "Update"
 msgstr "Anwenden"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:57
 msgid "Reload picture from LDAP"
 msgstr "Bild neu laden"
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:71
 msgid "Only executable for members"
 msgstr "Nur ausführbar für Gruppen-Mitglieder"
 
-#: plugins/admin/applications/generic.tpl:72
+#: plugins/admin/applications/generic.tpl:73
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:77
 msgid "Place icon on members desktop"
 msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/generic.tpl:80
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:82
+#: plugins/admin/applications/generic.tpl:83
 msgid "Place entry in members launch bar"
 msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 
-#: plugins/admin/applications/generic.tpl:95
+#: plugins/admin/applications/generic.tpl:96
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
@@ -5415,11 +6129,21 @@ msgstr "Standardwert"
 msgid "Add option"
 msgstr "Option hinzufügen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:158
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, fuzzy
+msgid "Removing application parameters failed"
+msgstr "Anwendungen entfernen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:159
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
 
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, fuzzy
+msgid "Saving applications parameters failed"
+msgstr "Diese Applikation hat veränderte Parameter."
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5434,60 +6158,106 @@ msgstr ""
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:87
+#: plugins/admin/applications/class_applicationGeneric.inc:96
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:107
+#: plugins/admin/applications/class_applicationGeneric.inc:116
 msgid "This 'dn' is no application."
 msgstr "Dieser 'DN' ist keine Anwendung."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:215
+#: plugins/admin/applications/class_applicationGeneric.inc:173
+#, fuzzy
+msgid "Removing application failed"
+msgstr "Anwendungen entfernen"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:185
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
+msgstr "Entfernen der Anwendung von Objektgruppe '%s' fehlgeschlagen"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:192
+#, fuzzy, php-format
+msgid "Removing application from group '%s' failed"
+msgstr "Zeige Anwendungs-Gruppen"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:234
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:296
+#: plugins/admin/applications/class_applicationGeneric.inc:310
+msgid "Specified execute path must start with '/'."
+msgstr "Der angegebene Ausführungspfad muss zwingend mit '/' beginnen."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:324
 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:301
+#: plugins/admin/applications/class_applicationGeneric.inc:329
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:305
+#: plugins/admin/applications/class_applicationGeneric.inc:333
 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:309
+#: plugins/admin/applications/class_applicationGeneric.inc:337
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:318
+#: plugins/admin/applications/class_applicationGeneric.inc:352
+#: plugins/admin/applications/class_applicationGeneric.inc:360
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
-#: plugins/admin/applications/class_applicationManagement.inc:254
+#: plugins/admin/applications/class_applicationGeneric.inc:391
+#, fuzzy
+msgid "Saving application failed"
+msgstr "Name der Anwendung"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:416
+msgid "Application settings"
+msgstr "Anwendungs-Einstellungen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:260
-#: plugins/admin/applications/class_applicationManagement.inc:286
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/ogroups/class_ogroupManagement.inc:439
+#: include/class_CopyPasteHandler.inc:216
+msgid "Paste"
+msgstr "Einfügen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:437
+#: plugins/admin/ogroups/class_ogroupManagement.inc:441
+#: include/class_CopyPasteHandler.inc:218
+msgid "Can't paste"
+msgstr "Kann nicht einfügen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:450
+#: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/applications/class_applicationManagement.inc:450
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
+#: plugins/admin/applications/class_applicationManagement.inc:499
+#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+msgid "This table displays all groups, in the selected tree."
+msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
+
 #: plugins/admin/departments/headpage.tpl:6
 msgid "List of departments"
 msgstr "Liste der Abteilungen"
@@ -5508,7 +6278,7 @@ msgstr "Zeige Abteilungen, auf die zutrifft"
 
 #: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
-msgstr "Regulärer Ausdruck zur Suche nach Abteilungs-Namen"
+msgstr "Regulärer Ausdruck zum Erkennen von Abteilungs-Namen"
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -5556,7 +6326,15 @@ msgstr "Einleitende Telefonnummer dieses Unterbaums"
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Einleitende Fax-Nummer dieses Unterbaums"
 
-#: plugins/admin/departments/tabs_department.inc:29
+#: plugins/admin/departments/generic.tpl:77
+msgid "Administrative settings"
+msgstr "Administrative Einstellungen"
+
+#: plugins/admin/departments/generic.tpl:79
+msgid "Tag department as an independent administrative unit"
+msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
+
+#: plugins/admin/departments/tabs_department.inc:31
 #: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
 #: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
 #: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
@@ -5588,70 +6366,125 @@ msgstr ""
 "haben, drücken Sie <i>Entfernen</i> um Fortzufahren oder <i>Abbrechen</i>, "
 "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:38 plugins/admin/departments/main.inc:40
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:176
+#: plugins/admin/departments/class_departmentGeneric.inc:169
+#, fuzzy
+msgid "Removing department failed"
+msgstr "Aktualisieren"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:218
 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:183
-#: plugins/admin/departments/class_departmentGeneric.inc:185
+#: plugins/admin/departments/class_departmentGeneric.inc:225
+#: plugins/admin/departments/class_departmentGeneric.inc:227
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:193
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:198
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Das Feld 'Name' enthält das reservierte Wort 'incoming'."
+#: plugins/admin/departments/class_departmentGeneric.inc:245
+#, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
+msgstr ""
+"Das Feld 'Name' enthält das reservierte Wort '%s'. Bitte wählen Sie einen "
+"anderen Namen."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:291
+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:199
-msgid " Please choose another name."
-msgstr "Bitte wählen Sie einen anderen Namen."
+#: plugins/admin/departments/class_departmentGeneric.inc:333
+#, fuzzy
+msgid "Saving department failed"
+msgstr "Aktualisieren"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:370
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Markiere '%s'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:447
+#, fuzzy, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Verschiebe %s nach %s"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:486
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Fehler beim kopieren von %s, breche ab"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
+#: plugins/admin/ogroups/class_ogroupManagement.inc:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
 msgid "Departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentManagement.inc:196
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:180
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/departments/class_departmentManagement.inc:322
+#: plugins/admin/fai/class_faiManagement.inc:648
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
-#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/departments/class_departmentManagement.inc:325
 msgid "Create new department"
 msgstr "Neue Abteilung erstellen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/departments/class_departmentManagement.inc:333
 msgid "This table displays all departments, in the selected tree."
 msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
 
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/departments/class_departmentManagement.inc:342
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_departmentManagement.inc:392
+#: plugins/admin/departments/class_departmentManagement.inc:438
 msgid ".."
 msgstr ".."
 
@@ -5672,7 +6505,8 @@ msgid "Enable DNS for this device"
 msgstr "DNS für dieses Gerät aktivieren"
 
 #: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:55
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:67
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -5682,8 +6516,8 @@ msgid "Zone"
 msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:272
-#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
 
@@ -5692,49 +6526,49 @@ msgid "Dns records"
 msgstr "DNS-Einträge"
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "vorhanden"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:139
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-#: plugins/admin/systems/class_workstationStartup.inc:265
-#: plugins/admin/systems/class_workstationService.inc:131
+#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:120
+#: plugins/admin/systems/class_terminalGeneric.inc:180
+#: plugins/admin/systems/class_workstationStartup.inc:401
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Das PHP-SNMP-Modul ist nicht installiert, kann daher keine Information "
 "sammeln."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "unbekannter Status"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Dies ist ein virtuelles Terminal, deshalb können an dieser Stelle keine "
 "Informationen angezeigt werden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "aktiv"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "läuft"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "läuft nicht"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "inaktiv"
 
@@ -5746,27 +6580,27 @@ msgstr "Zeit-Dienst"
 msgid "LDAP Service"
 msgstr "LDAP-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Terminal-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr "Anmeldung sperren (temporär)"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr "Schrift-Suchpfad"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr "Protokoll-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr "Druck-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Mail-Server"
 
@@ -5873,20 +6707,20 @@ msgstr "GUI"
 msgid "This 'dn' has no network features."
 msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:154
 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:172
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:523
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_phoneGeneric.inc:314
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:611
+#: plugins/admin/systems/class_componentGeneric.inc:164
+#: plugins/admin/systems/class_phoneGeneric.inc:311
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -5896,139 +6730,154 @@ msgstr ""
 msgid "System management"
 msgstr "Systemverwaltung"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Terminal-Vorlage"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Terminal-Name"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modus"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Wählen Sie den Terminal-Modus"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+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:54
 msgid "Root server"
 msgstr "Root-Server"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 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:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Protokoll-Server"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-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:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr "Zeit-Server-Attribute übernehmen"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "Zeit-Server"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 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:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Aktion"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.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:83
-#: plugins/admin/systems/class_workstationService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "Standard"
 
-#: plugins/admin/systems/class_terminalService.inc:84
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "zeige Auswahl"
 
-#: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:71
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "direkt"
 
-#: plugins/admin/systems/class_terminalService.inc:88
-#: plugins/admin/systems/class_workstationService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:107
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "lastverteilt"
 
-#: plugins/admin/systems/class_terminalService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:77
+#: plugins/admin/systems/class_terminalService.inc:110
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:78
+#: plugins/admin/systems/class_terminalService.inc:111
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "Citrix Metaframe"
 
-#: plugins/admin/systems/class_terminalService.inc:187
-#: plugins/admin/systems/class_workstationService.inc:178
+#: plugins/admin/systems/class_terminalService.inc:209
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:240
-#: plugins/admin/systems/class_workstationService.inc:245
+#: plugins/admin/systems/class_terminalService.inc:271
+#: plugins/admin/systems/class_terminalService.inc:276
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:255
-#: plugins/admin/systems/class_workstationService.inc:260
+#: plugins/admin/systems/class_terminalService.inc:286
+#: plugins/admin/systems/class_terminalService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 
+#: plugins/admin/systems/class_terminalStartup.inc:91
+#: plugins/admin/systems/class_workstationStartup.inc:232
+#, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+"Das in KERNELS angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Server-Name"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
@@ -6036,15 +6885,15 @@ msgstr "W
 msgid "Phone name"
 msgstr "Telefon-Name"
 
-#: plugins/admin/systems/class_servService.inc:272
+#: plugins/admin/systems/class_servService.inc:320
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
@@ -6098,27 +6947,27 @@ msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 msgid "Admins"
 msgstr "Administratoren"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "textuell"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 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:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:125
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6126,58 +6975,106 @@ msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 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:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 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:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:190
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:190
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:196
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 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:273
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:304
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+"Es muss mindestens ein NTP-Server ausgewählt sein, wenn der Übernahme-Modus "
+"nicht aktiv ist."
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:91
+msgid "Activated"
+msgstr "Aktiv"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+msgid "Memory test"
+msgstr "Speichertest"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:94
+msgid "System analysis"
+msgstr "Systemanalyse"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+msgid "Instant update"
+msgstr "Sofortiges Update"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+msgid "Scheduled update"
+msgstr "Geplantes Update"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Reinstall"
+msgstr "Neu-Installation"
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:194
+msgid "Rescan hardware"
+msgstr "Hardware neu erkennen"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 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:198
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
@@ -6207,51 +7104,21 @@ 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:70
-msgid "Activated"
-msgstr "Aktiv"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Speichertest"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Systemanalyse"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:121
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:135
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Sofortiges Update"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Geplantes Update"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Neu-Installation"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Hardware neu erkennen"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:228
+#: plugins/admin/systems/class_workstationGeneric.inc:277
 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:232
+#: plugins/admin/systems/class_workstationGeneric.inc:281
 msgid "The required field 'Workstation name' is not set."
 msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 
@@ -6259,178 +7126,118 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:429
+#: plugins/admin/systems/class_systemManagement.inc:211
 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:455
+#: plugins/admin/systems/class_systemManagement.inc:236
 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:472
+#: plugins/admin/systems/class_systemManagement.inc:253
 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:526
+#: plugins/admin/systems/class_systemManagement.inc:307
 #, 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:532
-#: plugins/admin/systems/class_systemManagement.inc:603
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 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:760
-msgid "New Terminal template"
-msgstr "Neue Terminal-Vorlage"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
+#: plugins/admin/systems/class_systemManagement.inc:615
+msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
-msgstr "Neue Vorlage für Arbeitsstation"
-
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
+#: plugins/admin/systems/class_systemManagement.inc:617
+msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
-msgstr "Neuer Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
-msgstr "Neuer Drucker"
-
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
-msgstr "Neues Telefon"
-
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
-msgstr "Neue Netzwerk-Komponente"
-
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
-msgstr "System bearbeiten"
-
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
-msgstr "Entferne System"
-
-#: plugins/admin/systems/class_systemManagement.inc:787
-#: plugins/admin/fai/class_faiManagement.inc:677
-msgid "This table displays all systems, in the selected tree."
-msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
-
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
-msgstr "Systeme"
-
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
-msgstr "CUPS-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
-msgstr "Log-DB"
-
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
-msgstr "Syslog-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
-msgstr "Mail-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
-msgstr "IMAP-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
-msgstr "NFS-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
-msgstr "Kerberos-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
-msgstr "Asterisk-Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
-msgstr "Fax-Server"
+#: plugins/admin/systems/class_systemManagement.inc:619
+msgid "New Device"
+msgstr "Neues Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
-msgstr "LDAP-Server"
+#: plugins/admin/systems/class_systemManagement.inc:634
+msgid "Terminal template for"
+msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
-msgstr "root-Passwort setzen"
+#: plugins/admin/systems/class_systemManagement.inc:646
+msgid "Workstation template for"
+msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:916
+#: plugins/admin/systems/class_systemManagement.inc:734
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:918
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:496
+#: plugins/admin/ogroups/class_ogroupManagement.inc:598
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_systemManagement.inc:737
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:922
+#: plugins/admin/systems/class_systemManagement.inc:738
+#, fuzzy
+msgid "Workstation is installing"
+msgstr "Name der Arbeitsstation"
+
+#: plugins/admin/systems/class_systemManagement.inc:739
+#, fuzzy
+msgid "Workstation is waiting for action"
+msgstr "Arbeitsstations-Vorlage für"
+
+#: plugins/admin/systems/class_systemManagement.inc:740
+#, fuzzy
+msgid "Workstation installation failed"
+msgstr "Vorlage für Arbeitsstation"
+
+#: plugins/admin/systems/class_systemManagement.inc:743
+msgid "Server is installing"
+msgstr "Server wird installiert"
+
+#: plugins/admin/systems/class_systemManagement.inc:744
+#, fuzzy
+msgid "Server is waiting for action"
+msgstr "Generische Benutzer-Information"
+
+#: plugins/admin/systems/class_systemManagement.inc:745
+#, fuzzy
+msgid "Server installation failed"
+msgstr "Serverbezeichnung"
+
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
+#: plugins/admin/systems/class_systemManagement.inc:747
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
+#: plugins/admin/systems/class_systemManagement.inc:748
+#: plugins/admin/systems/class_divListSystem.inc:96
+msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
+#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_divListSystem.inc:98
+msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
-msgstr "Neues Gerät"
-
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
-msgstr "Terminal-Vorlage für"
-
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Arbeitsstations-Vorlage für"
-
 #: plugins/admin/systems/servdns.tpl:1
 msgid "Zones"
 msgstr "Zonen"
@@ -6512,12 +7319,12 @@ msgstr "Akzeptiere Internet-Mail"
 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:176
+#: plugins/admin/systems/class_servDNS.inc:67
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr "DNS-Dienst entfernen"
 
-#: plugins/admin/systems/class_servDNS.inc:177
+#: plugins/admin/systems/class_servDNS.inc:68
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
@@ -6525,12 +7332,12 @@ msgstr ""
 "Dieser Server besitzt aktivierte DNS-Funktionen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/systems/class_servDNS.inc:179
+#: plugins/admin/systems/class_servDNS.inc:70
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr "DNS-Dienst hinzufügen"
 
-#: plugins/admin/systems/class_servDNS.inc:180
+#: plugins/admin/systems/class_servDNS.inc:71
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
@@ -6538,7 +7345,16 @@ msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten DNS-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servDNS.inc:247
+#: plugins/admin/systems/class_servDNS.inc:159
+msgid "Reverse zone"
+msgstr "Reverse Zone"
+
+#: plugins/admin/systems/class_servDNS.inc:161
+#: plugins/admin/fai/faiTemplateEntry.tpl:86
+msgid "Class"
+msgstr "Klasse"
+
+#: plugins/admin/systems/class_servDNS.inc:223
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
@@ -6547,15 +7363,6 @@ 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:271
-msgid "Reverse zone"
-msgstr "Reverse Zone"
-
-#: plugins/admin/systems/class_servDNS.inc:273
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
-msgid "Class"
-msgstr "Klasse"
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr "Kerberos-Zugang via kadmin"
@@ -6628,123 +7435,37 @@ msgstr "Datenbank"
 msgid "Machine name"
 msgstr "Name des Systems"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
+#: plugins/admin/systems/class_servDB.inc:136
+#: plugins/admin/systems/class_servDB.inc:145
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:177
+#: plugins/admin/systems/class_servDB.inc:183
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servDB.inc:151
+#: plugins/admin/systems/class_servDB.inc:152
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
 
-#: plugins/admin/systems/class_servDB.inc:155
+#: plugins/admin/systems/class_servDB.inc:156
 msgid "The sieve port needs to be numeric."
 msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/class_servDB.inc:166
+#: plugins/admin/systems/class_servDB.inc:167
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr "Das angebene Kerberos-Passwort ist leer."
 
-#: plugins/admin/systems/class_servDB.inc:190
+#: plugins/admin/systems/class_servDB.inc:191
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 "Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
 "sein."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste der Systeme"
-
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
-"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
-"hinzufügen, die bereits einmal im Netz gestartet wurden."
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Wählen um Server anzuzeigen"
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Wählen, um Linux-Terminals zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Wählen, um Linux-Arbeitsstationen zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Auswählen, um Microsoft Windows Arbeitsstationen zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Zeige Windows basierte Arbeitsstationen"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Zeige Netzwerk-Drucker"
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Zeige Telefone"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Wählen, um Netzwerk-Geräte zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Zeige Netzwerk-Geräte"
-
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Regulärer Ausdruck für System-Namen"
-
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Zeige Systeme des Benutzers"
-
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
-
 #: plugins/admin/systems/remove.tpl:6
 msgid ""
 "This includes <b>all</b> system and setup informations. Please double check "
@@ -6790,68 +7511,82 @@ msgstr ""
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
 
-#: plugins/admin/systems/class_servKolab.inc:227
+#: plugins/admin/systems/class_servKolab.inc:229
 msgid "Future days in Free/Busy settings must be set."
 msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
 
-#: plugins/admin/systems/class_servKolab.inc:229
+#: plugins/admin/systems/class_servKolab.inc:231
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
 
-#: plugins/admin/systems/class_servKolab.inc:233
+#: plugins/admin/systems/class_servKolab.inc:235
 msgid "The given Quota settings value must be a number."
 msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/class_servKolab.inc:235
+#: plugins/admin/systems/class_servKolab.inc:237
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
 
-#: plugins/admin/systems/class_servKolab.inc:237
+#: plugins/admin/systems/class_servKolab.inc:239
 msgid "Future days must be a value."
 msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/class_servKolab.inc:241
+#: plugins/admin/systems/class_servKolab.inc:243
 msgid "No SMTP privileged networks set."
 msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
 
-#: plugins/admin/systems/class_servKolab.inc:245
-msgid "No SMTP smarthost/relayhost set."
-msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
+#: plugins/admin/systems/class_printGeneric.inc:103
+#, 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:175
-#: plugins/admin/systems/class_printGeneric.inc:182
-#: plugins/admin/systems/class_printGeneric.inc:217
-#: plugins/admin/systems/class_printGeneric.inc:238
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:247
+#: plugins/admin/systems/class_printGeneric.inc:286
+#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:305
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_printGeneric.inc:176
+#: plugins/admin/systems/class_printGeneric.inc:235
+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:243
 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:183
+#: plugins/admin/systems/class_printGeneric.inc:248
 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:218
+#: plugins/admin/systems/class_printGeneric.inc:279
+msgid "This 'dn' has no printer features."
+msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
+
+#: plugins/admin/systems/class_printGeneric.inc:287
 msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+"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 "
+"template"
 msgstr ""
-"Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
-"können diese nicht aktivieren, solange das 'cn'-Attribute nicht im Eintrag "
+"Aktuell besitzt dieses Objekt keine aktivierte Drucker-Erweiterung. Sie "
+"können diese nicht aktivieren, solange das 'cn'-Attribut nicht im Eintrag "
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: plugins/admin/systems/class_printGeneric.inc:230
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:297
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_printGeneric.inc:231
+#: plugins/admin/systems/class_printGeneric.inc:295
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -6859,7 +7594,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:234
+#: plugins/admin/systems/class_printGeneric.inc:298
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -6867,7 +7602,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:239
+#: plugins/admin/systems/class_printGeneric.inc:303
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -6875,7 +7610,7 @@ msgstr ""
 "Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -6883,40 +7618,30 @@ 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:277
-msgid "This 'dn' has no printer features."
-msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
-
-#: plugins/admin/systems/class_printGeneric.inc:413
+#: plugins/admin/systems/class_printGeneric.inc:478
 #, 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:421
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "can't get ppd informations."
 msgstr "keine PPD-Informationen verfügbar"
 
-#: plugins/admin/systems/class_printGeneric.inc:433
+#: plugins/admin/systems/class_printGeneric.inc:499
 #, 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:435
+#: plugins/admin/systems/class_printGeneric.inc:501
 #, 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:513
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_printGeneric.inc:666
-#: plugins/admin/systems/class_printGeneric.inc:668
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: plugins/admin/systems/class_printGeneric.inc:746
+#: plugins/admin/systems/class_printGeneric.inc:748
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
@@ -6948,6 +7673,66 @@ msgstr ""
 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:143
+#: plugins/admin/systems/class_phoneGeneric.inc:283
+#, fuzzy
+msgid "The required field IP address is empty."
+msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
+
+#: plugins/admin/systems/class_componentGeneric.inc:146
+#: plugins/admin/systems/class_phoneGeneric.inc:286
+#, fuzzy
+msgid "The field IP address contains an invalid address."
+msgstr "Das Feld 'Name' enthält ungültige Zeichen."
+
+#: 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"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Linux Terminals und Arbeitsstationen werden beim Systemstart automatisch "
+"hinzugefügt. Aus diesem Grund können Sie für diese Systemtypen nur Vorlagen "
+"für einen Unterbaum anlegen. Server werden ebenfalls automatisch "
+"hinzugefügt, in einigen Fällen benötigen Sie Pseudo-Einträge um GOsa mit "
+"benötigten Informationen zu versorgen. Weitere Netzwerk-Komponenten können z."
+"B. für Nagios Umgebungen genutzt werden um die Abhängigkeiten aufzulösen."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Linux Thin-Client Vorlage"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Linux Arbeitsstations-Vorlage"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Linux Server"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Windows Arbeitsstation"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Netzwerk-Drucker"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Andere Netzwerk-Komponente"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Anlegen"
+
 #: plugins/admin/systems/glpiPrinter.tpl:9
 msgid "Printer type"
 msgstr "Druckertyp"
@@ -7007,54 +7792,6 @@ msgstr "Anh
 msgid "Installed cartridges"
 msgstr "Installierte Patronen"
 
-#: 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"
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Linux Terminals und Arbeitsstationen werden beim Systemstart automatisch "
-"hinzugefügt. Aus diesem Grund können Sie für diese Systemtypen nur Vorlagen "
-"für einen Unterbaum anlegen. Server werden ebenfalls automatisch "
-"hinzugefügt, in einigen Fällen benötigen Sie Pseudo-Einträge um GOsa mit "
-"benötigten Informationen zu versorgen. Weitere Netzwerk-Komponenten können z."
-"B. für Nagios Umgebungen genutzt werden um die Abhängigkeiten aufzulösen."
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Linux Thin-Client Vorlage"
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Linux Arbeitsstations-Vorlage"
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Linux Server"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Windows Arbeitsstation"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Netzwerk-Drucker"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Andere Netzwerk-Komponente"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Anlegen"
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Freigabe bearbeiten"
@@ -7063,15 +7800,20 @@ msgstr "Freigabe bearbeiten"
 msgid "NFS setup"
 msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Pfad"
+#: plugins/admin/systems/servnfs.tpl:33
+#, fuzzy
+msgid "Volume"
+msgstr "Heimat"
+
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:88
 msgid "Codepage"
 msgstr "Codepage"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:98
 msgid "Option"
 msgstr "Option"
 
@@ -7133,25 +7875,25 @@ msgstr ""
 msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
 msgid "yes"
 msgstr "ja"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
 msgid "no"
 msgstr "nein"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:224
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:224
 msgid "Networksettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: plugins/admin/systems/class_phoneGeneric.inc:239
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
@@ -7160,60 +7902,80 @@ msgstr ""
 "Das Telefon kann nicht entfernt werden, da es abhängige Benutzer gibt. Der "
 "erste Benutzer in der Liste ist '%s'."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
+#: plugins/admin/systems/class_phoneGeneric.inc:291
 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:297
+#: plugins/admin/systems/class_phoneGeneric.inc:294
 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:304
+#: plugins/admin/systems/class_phoneGeneric.inc:301
 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_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 "Die Datei '/etc/gosa/encodings' wurde nicht gefunden, kann die unterstützten "
 "Zeichensätze nicht einlesen."
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: 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."
 
-#: plugins/admin/systems/class_servNfs.inc:125
+#: plugins/admin/systems/class_servNfs.inc:179
 msgid "Please specify a valid path for your setup."
 msgstr "Bitte geben Sie einen gültigen Pfad an."
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
+#: plugins/admin/systems/class_servNfs.inc:185
+#, fuzzy
+msgid "Please specify a valid name for your share."
 msgstr "Bitte geben Sie einen gültigen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
+#: plugins/admin/systems/class_servNfs.inc:188
+#, fuzzy
+msgid "Please specify a name for your share."
 msgstr "Bitte geben Sie einen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:139
+#: plugins/admin/systems/class_servNfs.inc:193
 msgid "Description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:143
+#: plugins/admin/systems/class_servNfs.inc:197
+#, fuzzy
+msgid "Volume contains invalid characters."
+msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
+
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:247
+#: plugins/admin/systems/class_workstationStartup.inc:225
+msgid "inherited"
+msgstr "ererbt"
+
+#: plugins/admin/systems/class_workstationStartup.inc:336
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
+"Es existieren in Ihrer derzeitigen Konfiguration Pakete, die mit den "
+"momentanen Einstellungen für Server und Release nicht aufgelöst werden "
+"können."
+
+#: plugins/admin/systems/class_workstationStartup.inc:381
 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:303
+#: plugins/admin/systems/class_workstationStartup.inc:439
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -7221,6 +7983,28 @@ msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
+#: plugins/admin/systems/class_workstationStartup.inc:758
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+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:769
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
+"Kann die angegebenen FAI-Klasse(n) [%s] nicht auflösen, bitte überprüfen Sie "
+"Ihre FAI-Konfigurationen (wahrscheinlich wurden einige Klassen entfernt oder "
+"umbenannt). Alle (!) Klassen wurden von diesem Konto entfernt. Drücken Sie "
+"'Abbrechen', wenn Sie die diese Änderung nicht speichern möchten."
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Erweiterte Telefon-Einstellungen"
@@ -7313,65 +8097,94 @@ msgstr "Zeige die Mitglieder, auf die Folgendes passt"
 msgid "Regular expression for matching member names"
 msgstr "Regulärer Ausdruck zum Erkennen von Mitgliedsnamen"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr "Kann '%s' nicht öffnen, PPD-Einstellungen wurden  zurückgesetzt."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
-#, php-format
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+msgid "Can't get ppd informations."
+msgstr "Kann PPD-Information nicht lesen"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#, fuzzy, php-format
 msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid,"
 msgstr ""
 "Der in Ihrer 'gosa.conf' angegebene PPD-Pfad (PPD_PATH) '%s' ist ungültig - "
 "kann daher keine ppd-Informationen lesen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
-msgstr "Kann PPD-Information nicht lesen"
+#: plugins/admin/systems/class_printerPPDDialog.inc:100
+#, fuzzy, php-format
+msgid " can't read/write any ppd informations."
+msgstr "keine PPD-Informationen verfügbar"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:117
+msgid "Please specify a valid ppd file."
+msgstr "Bitte geben Sie eine gültige PPD-Datei an."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:187
+#, fuzzy, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
+msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_printerPPDDialog.inc:204
+#: plugins/admin/systems/class_printerPPDDialog.inc:276
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr "Kann Verzeichnis '%s' für hochgeladene PPD-Datei nicht anlegen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_printerPPDDialog.inc:212
+#, fuzzy, php-format
+msgid "Can't create file '%s' to store modifed ppd informations."
+msgstr "Kann Verzeichnis '%s' für hochgeladene PPD-Datei nicht anlegen."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:236
+#, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
+msgstr "Kann neue PPD-Datei nicht hinzufügen, auf die Quelldatei '%s' konnte nicht zugegriffen werden."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:254
+#, fuzzy, php-format
+msgid ""
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
+msgstr ""
+"Das PHP-SNMP-Modul ist nicht installiert, kann daher keine Information "
+"sammeln."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:268
 #, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 "Der von Ihnen gewählte Drucker-Typ verfügt bereits über eine PPD-Datei."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_printerPPDDialog.inc:289
 #, php-format
 msgid "Can't save file '%s'."
 msgstr "Kann Datei '%s' nicht speichern."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
-msgstr "Bitte geben Sie eine gültige PPD-Datei an."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
-msgstr "Bitte wählen Sie eine gültige PPD."
+#: plugins/admin/systems/class_printerPPDDialog.inc:293
+msgid "Uploaded ppd file is empty, can't create new ppd file."
+msgstr "Die hochgeladene PPD-Datei ist leer, kann daher keine neue PPD-Datei anlegen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:319
+#: plugins/admin/systems/class_printerPPDDialog.inc:414
 #: plugins/admin/fai/faiPackage.tpl:41
 msgid "Section"
 msgstr "Section"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 msgid "True"
 msgstr "wahr"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/class_printerPPDDialog.inc:464
+#: plugins/admin/systems/class_printerPPDDialog.inc:467
 msgid "False"
 msgstr "falsch"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:472
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
@@ -7388,7 +8201,6 @@ msgid "Model"
 msgstr "Modell"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 msgid "Select"
 msgstr "Auswahl"
 
@@ -7416,9 +8228,15 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 #: plugins/admin/fai/headpage.tpl:86 plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Objekt-Namen"
+msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, 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:74
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
 msgid "Printer ppd selection."
 msgstr "Auswahl der Drucker-PPD"
 
@@ -7475,6 +8293,7 @@ msgstr "W
 #: plugins/admin/systems/workstationService.tpl:66
 #: plugins/admin/systems/terminalService.tpl:66
 #: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Telefon-Hardware"
 
@@ -7482,6 +8301,7 @@ msgstr "Telefon-Hardware"
 #: plugins/admin/systems/terminalService.tpl:69
 #: plugins/gofon/phoneaccount/generic.tpl:26
 #: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -7560,33 +8380,16 @@ msgid "Boot parameters"
 msgstr "Boot-Parameter"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-Server"
-
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-"Wählen Sie den LDAP-Server, der für die Verwaltung von Benutzerkonten und "
-"Terminals genutzt wird"
-
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Boot-Kernel"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Geben Sie den Dateinamen des Kernels ein, der genutzt werden soll"
-
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Angepasste Optionen"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
@@ -7595,19 +8398,24 @@ msgstr ""
 "Geben Sie die Parameter ein, die dem Kernel beim Starten übergeben werden "
 "sollen"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-Server"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 msgid "FAI server"
 msgstr "FAI-Server"
 
 #: plugins/admin/systems/workstationStartup.tpl:39
 #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:196
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/class_servRepository.inc:248
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Release"
 
 #: plugins/admin/systems/workstationStartup.tpl:47
-#: plugins/admin/fai/faiPackageNew.tpl:35
 msgid "set"
 msgstr "setzen"
 
@@ -7626,6 +8434,11 @@ 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:99
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Mount-Pfad"
+
 #: plugins/admin/systems/terminalStartup.tpl:35
 msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
@@ -7710,64 +8523,169 @@ msgid "Parent server"
 msgstr "Parent-Server"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:197
-#: plugins/admin/systems/class_servRepository.inc:218
+#: plugins/admin/systems/class_servRepository.inc:249
+#: plugins/admin/systems/class_servRepository.inc:270
 msgid "Sections"
 msgstr "Sections"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
 msgid "Please enter a value for 'release'."
 msgstr "Bitte geben Sie einen Wert für 'Release' ein."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
 msgid "Please specify a valid value for 'url'."
 msgstr "Bitte geben Sie im Feld 'url' einen gültigen Wert ein."
 
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
+msgid "Can't execute specified EXTERNAL_HOOK '%s' please check your gosa.conf."
+msgstr "Kann das als EXTERNAL_HOOK angegebene Kommando '%s' nicht ausführen."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified EXTERNAL_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
+"Das als EXTERNAL_HOOK '%s' angegebene Kommando lieferte eine leere "
+"Zeichenkette."
+
 #: plugins/admin/systems/class_servRepository.inc:97
 msgid "Remove FAI repository extension."
 msgstr "FAI-Repository-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Dieser Server besitzt aktivierte FAI-Repository-Erweiterungen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten deaktivieren."
+
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr "FAI-Repository-Erweiterung hinzufügen"
+
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten FAI-Repository-"
+"Erweiterungen. Sie können diese durch einen Klick auf die Schaltfläche unten "
+"aktivieren."
+
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
+msgstr ""
+"Sie können dieses Release nicht entfernen, da es momentan noch von diesen "
+"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:176
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+"Seien Sie vorsichtig, wenn Sie dieses Release editieren - es wird momentan "
+"noch von folgenden Arbeitsstationen verwendet [%s]."
+
+#: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
+#: plugins/admin/fai/class_faiManagement.inc:392
+msgid "This name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
+msgstr "Liste der verfügbaren Repositories."
+
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr "Repository hinzufügen"
+
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
+"entfernen und zu bearbeiten."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
+"Datenbank verbinden."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
+"Konfiguration."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:565
+msgid "Remove inventory"
+msgstr "Inventar entfernen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Dieser Server besitzt aktivierte FAI-Repository-Erweiterungen. Sie können "
-"diese durch einen Klick auf die Schaltfläche unten deaktivieren."
+"Dieser Server besitzt aktivierte Inventar-Funtionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr "FAI-Repository-Erweiterung hinzufügen"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:568
+msgid "Add inventory"
+msgstr "Inventar hinzufügen"
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten FAI-Repository-"
-"Erweiterungen. Sie können diese durch einen Klick auf die Schaltfläche unten "
-"aktivieren."
+"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servRepository.inc:162
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
-#: plugins/admin/fai/class_faiManagement.inc:324
-#: plugins/admin/fai/class_faiManagement.inc:430
-msgid "This name is already in use."
-msgstr "Der angegebene Name wird bereits verwendet."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
+"verwendet."
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
-msgstr "Liste der verfügbaren Repositories."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
+"verwendet."
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
-msgstr "Repository hinzufügen"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+msgid "N/A"
+msgstr "N/A"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
-"entfernen und zu bearbeiten."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+msgid "since"
+msgstr "seit"
 
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
@@ -7813,31 +8731,11 @@ msgstr "Regul
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
 msgstr "Benutzen"
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
-
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
-"Datenbank verbinden."
-
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
-"Konfiguration."
-
 #: plugins/admin/systems/class_glpiAccount.inc:178
 #: plugins/admin/systems/class_glpiAccount.inc:184
 #: plugins/admin/systems/class_glpiAccount.inc:190
@@ -7884,12 +8782,7 @@ msgstr ""
 "Das Aktualisieren des Betriebssystems schlug fehl, da der angegebene Name "
 "bereits verwendet wird."
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-msgid "Remove inventory"
-msgstr "Inventar entfernen"
-
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiAccount.inc:566
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
@@ -7897,12 +8790,7 @@ msgstr ""
 "Dieses Gerät besitzt aktivierte Inventar-Funktionen. Sie können diese durch "
 "einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-msgid "Add inventory"
-msgstr "Inventar hinzufügen"
-
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiAccount.inc:569
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
@@ -7910,13 +8798,11 @@ msgstr ""
 "Aktuell besitzt dieses Gerät keine aktivierten Inventar-Funktionen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr "N/A"
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
+msgstr ""
+"Kann das glpi-Konto nicht entfernen, solange die MySQL-Erweiterung für PHP "
+"fehlt."
 
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
@@ -7943,13 +8829,6 @@ msgstr "MIME-Typ"
 msgid "use"
 msgstr "verwenden"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr ""
-"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
-"zu wählen."
-
 #: plugins/admin/systems/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "Monitor hinzufügen/bearbeiten"
@@ -8118,6 +8997,13 @@ msgstr "Computergeh
 msgid "format"
 msgstr "Format"
 
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
+"zu wählen."
+
 #: plugins/admin/systems/glpi_edit_os.tpl:1
 msgid "Manage OS-types"
 msgstr "Betriebssysteme verwalten"
@@ -8168,7 +9054,7 @@ msgid "New processor"
 msgstr "Neuer Prozessor"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_faiManagement.inc:643
+#: plugins/admin/fai/class_faiManagement.inc:655
 msgid "P"
 msgstr "P"
 
@@ -8252,16 +9138,16 @@ msgstr "Neues allgemeines Ger
 msgid "OC"
 msgstr "OC"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
 msgid "You have to specify a valid name for this device."
 msgstr "Bitte geben Sie einen gültigen Namen für dieses Gerät an."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
 msgid "This device name is already in use."
 msgstr "Der angegebene Gerätename wird bereits verwendet."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "Other"
 msgstr "Andere"
 
@@ -8274,6 +9160,8 @@ msgid "Website"
 msgstr "Website"
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:692
 #: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
@@ -8348,7 +9236,7 @@ msgstr "Neuen Anhang erstellen"
 msgid "New Attachment"
 msgstr "Neuer Anhang"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 msgid "Please specify a valid name for this attachment."
 msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
 
@@ -8370,7 +9258,7 @@ msgstr "Zeige Anh
 
 #: plugins/admin/systems/glpiAttachmentPool.tpl:37
 msgid "Regular expression for matching attachment names"
-msgstr "Regulärer Ausdruck zur Suche nach Anhangs-Namen"
+msgstr "Regulärer Ausdruck zum Erkennen von Anhangs-Namen"
 
 #: plugins/admin/systems/class_glpiManufacturer.inc:58
 #, php-format
@@ -8391,42 +9279,163 @@ msgid "Specified name is already in use, please choose another one."
 msgstr ""
 "Der angegebene Name wird bereits verwendet. Bitte wählen Sie einen anderen."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieser Server besitzt aktivierte Inventar-Funtionen. Sie können diese durch "
-"einen Klick auf die Schaltfläche unten deaktivieren."
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr "Liste der Systeme"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:42
 msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
+"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
+"hinzufügen, die bereits einmal im Netz gestartet wurden."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
-"verwendet."
+#: plugins/admin/systems/class_divListSystem.inc:52
+msgid "System / Department"
+msgstr "System / Abteilung"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
-"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
-"verwendet."
+#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Zeige Server"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
-msgstr "seit"
+#: plugins/admin/systems/class_divListSystem.inc:57
+msgid "Select to see Linux terminals"
+msgstr "Wählen, um Linux-Terminals zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:57
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Zeige Terminals"
+
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "Select to see Linux workstations"
+msgstr "Wählen, um Linux-Arbeitsstationen zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Zeige Arbeitsstationen"
+
+#: plugins/admin/systems/class_divListSystem.inc:59
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Auswählen, um Microsoft Windows Arbeitsstationen zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:59
+msgid "Show windows based workstations"
+msgstr "Zeige Windows basierte Arbeitsstationen"
+
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Select to see network printers"
+msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Show network printers"
+msgstr "Zeige Netzwerk-Drucker"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+msgid "Select to see VOIP phones"
+msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Zeige Telefone"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Select to see network devices"
+msgstr "Wählen, um Netzwerk-Geräte zu sehen"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Show network devices"
+msgstr "Zeige Netzwerk-Geräte"
+
+#: plugins/admin/systems/class_divListSystem.inc:70
+msgid "Display systems of user"
+msgstr "Zeige Systeme des Benutzers"
+
+#: plugins/admin/systems/class_divListSystem.inc:96
+msgid "New Terminal template"
+msgstr "Neue Terminal-Vorlage"
+
+#: plugins/admin/systems/class_divListSystem.inc:98
+msgid "New Workstation template"
+msgstr "Neue Vorlage für Arbeitsstation"
+
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:100
+msgid "New Server"
+msgstr "Neuer Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:102
+msgid "New Printer"
+msgstr "Neuer Drucker"
+
+#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:104
+msgid "New Phone"
+msgstr "Neues Telefon"
+
+#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:106
+msgid "New Component"
+msgstr "Neue Netzwerk-Komponente"
+
+#: plugins/admin/systems/class_divListSystem.inc:123
+msgid "Cups Server"
+msgstr "CUPS-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:124
+msgid "Log Db"
+msgstr "Log-DB"
+
+#: plugins/admin/systems/class_divListSystem.inc:125
+msgid "Syslog Server"
+msgstr "Syslog-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:126
+msgid "Mail Server"
+msgstr "Mail-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:127
+msgid "Imap Server"
+msgstr "IMAP-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:128
+msgid "Nfs Server"
+msgstr "NFS-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:129
+msgid "Kerberos Server"
+msgstr "Kerberos-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:130
+msgid "Asterisk Server"
+msgstr "Asterisk-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:131
+msgid "Fax Server"
+msgstr "Fax-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:132
+msgid "Ldap Server"
+msgstr "LDAP-Server"
+
+#: plugins/admin/systems/class_divListSystem.inc:135
+msgid "Edit system"
+msgstr "System bearbeiten"
+
+#: plugins/admin/systems/class_divListSystem.inc:136
+msgid "Delete system"
+msgstr "Entferne System"
+
+#: plugins/admin/systems/class_divListSystem.inc:169
+msgid "Set root       password"
+msgstr "root-Passwort setzen"
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
@@ -8446,27 +9455,38 @@ msgstr ""
 msgid "Cartridges"
 msgstr "Patronen"
 
-#: plugins/admin/systems/class_termDNS.inc:296
+#: plugins/admin/systems/class_termDNS.inc:264
 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:302
+#: plugins/admin/systems/class_termDNS.inc:271
 msgid "Wrong IP format in field IP-address."
 msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 
-#: plugins/admin/systems/class_termDNS.inc:308
+#: plugins/admin/systems/class_termDNS.inc:278
 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:314
+#: plugins/admin/systems/class_termDNS.inc:285
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
-"Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 1-Byte Segmente "
+"Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 2-Byte Segmente "
 "angegeben werden (getrennt durch ':')."
 
-#: plugins/admin/systems/class_termDNS.inc:323
+#: plugins/admin/systems/class_termDNS.inc:305
+#, 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:313
+#, 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:324
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -8475,8 +9495,8 @@ 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:329
-#: plugins/admin/systems/class_servDNSeditZone.inc:199
+#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_servDNSeditZone.inc:401
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
@@ -8485,7 +9505,7 @@ msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte pr
 msgid "Can't delete this entry, it is still in use."
 msgstr "Kann diesen Eintrag nicht entfernen, da er noch benutzt wird."
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
 msgid "The selected name is already in use."
 msgstr "Der angegebene Name wird bereits verwendet."
 
@@ -8519,104 +9539,114 @@ msgstr "Regul
 msgid "Reference"
 msgstr "Referenz"
 
-#: plugins/admin/systems/servdnseditzone.tpl:1
-msgid "Zone settings"
-msgstr "Zonen-Einstellungen"
-
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: plugins/admin/systems/servdnseditzone.tpl:17
-msgid "Subnet"
-msgstr "Subnetz"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
+msgstr "Netzwerk-Adresse"
+
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone entries"
+msgstr "Zonen-Einträge"
 
 #: plugins/admin/systems/servdnseditzone.tpl:27
-msgid "SOA record for this zone"
-msgstr "SOA-Eintrag für diese Zone"
+msgid "Can't be edited because the zone wasn't saved right now."
+msgstr ""
+"Kann nicht bearbeitet werden, da die Zone bis jetzt nicht gespeichert wurde."
 
-#: plugins/admin/systems/servdnseditzone.tpl:33
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
+msgstr "SOA-Eintrag"
+
+#: plugins/admin/systems/servdnseditzone.tpl:45
 msgid "Primary dns server for this zone"
 msgstr "Primärer DNS-Server für diese Zone"
 
-#: plugins/admin/systems/servdnseditzone.tpl:45
+#: plugins/admin/systems/servdnseditzone.tpl:57
 msgid "Serial number (automatically incremented)"
 msgstr "Seriennummer (automatisch inkrementiert)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:61
+#: plugins/admin/systems/servdnseditzone.tpl:73
 #: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/admin/systems/servdnseditzone.tpl:79
 msgid "Expire"
 msgstr "Ablauf"
 
-#: plugins/admin/systems/servdnseditzone.tpl:91
-msgid "DNS TTL"
-msgstr "DNS TTL"
-
-#: plugins/admin/systems/servdnseditzone.tpl:98
-msgid "DNS Class"
-msgstr "DNS-Klasse"
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
+msgstr "MX-Einträge"
 
-#: plugins/admin/systems/servdnseditzone.tpl:107
-msgid "Records"
-msgstr "Einträge"
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Zone records"
+msgstr "Zonen-Einträge"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 "DIes ist ein neues System, für das bisher noch kein Systemtyp definiert "
-"wurde. Bitte wählen Sie einen solchen Systemtyp für das gewählte System, der "
-"abhängige Dialog wird angezeigt, sobald Sie auf 'Speichern' klicken. Wenn "
-"das System zu einer Objektgruppe hinzugefügt werden soll, geben Sie den "
-"Namen der Objektgruppe an, das System wird automatisch hinzugefügt."
+"wurde. Bitte wählen Sie einen Systemtyp für dieses System und drücken auf "
+"'Speichern' klicken. Wenn das System zu einer Gruppe von Systemeinstellungen "
+"hinzugefügt werden soll, geben Sie den Namen der Objektgruppe ein."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
-"Bitte wählen Sie einen Systemtyp (und wenn  gewünscht eine Objektgruppe)."
+"Bitte wählen Sie einen Systemtyp und (optional) einen Satz von "
+"vordefinierten Einstellungen (werden automatisch übernommen)."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
 msgid "Choose a system type"
 msgstr "Wählen Sie den System-Typ"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr "Mitglied in folgenden Objektgruppen"
+#, fuzzy
+msgid "Choose an object group as template"
+msgstr "Objektgruppe wählen"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Objektgruppe wählen"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:149
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
+#: plugins/admin/ogroups/phonequeue.tpl:18
+#: plugins/admin/fai/class_faiProfile.inc:304
+msgid "Down"
+msgstr "Ab"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
 msgid "This zoneName is already in use"
 msgstr "Der angegebene Zonen-Name wird bereits verwendet."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:152
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
 msgid "This reverse zone is already in use"
 msgstr "Die reverse-Zone wird bereits verwendet."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:157
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
 msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 "Der Primäre DNS-Server muss mit '.' enden, um ein gültiger Eintrag zu sein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:161
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
 msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 "Die angegebene Email-Adresse muss mit '.' enden, um ein gültiger Eintrag zu "
 "sein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:165
-#: plugins/admin/systems/class_servDNSeditZone.inc:169
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
 msgid ""
 "Your mail address contains '@' replace this with '.' to enable GOsa to "
 "create a valid SOA record."
@@ -8624,27 +9654,27 @@ msgstr ""
 "Ihre Email-Adresse enthält '@'. Bitte ersetzen Sie dieses Zeichen durch '.', "
 "um einen gültigen SOA-Eintrag zu erzeugen."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:173
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
 msgid "Only lowercase strings are allowed as zone name."
 msgstr "Für den Zonennamen sind nur Kleinbuchstaben zugelassen."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
 msgid "Please specify a numeric value for serial number."
 msgstr "Bitte geben Sie im Feld 'Seriennummer' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:181
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
 msgid "Please specify a numeric value for refresh."
 msgstr "Bitte geben Sie im Feld 'Aktualisieren' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:185
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
 msgid "Please specify a numeric value for ttl."
 msgstr "Bitte geben Sie im Feld 'TTL' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:189
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 msgid "Please specify a numeric value for expire."
 msgstr "Bitte geben Sie im Feld 'Ablauf' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:193
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 msgid "Please specify a numeric value for retry."
 msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
 
@@ -8652,7 +9682,7 @@ msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
 msgid "Choose a base"
 msgstr "Wählen Sie eine Basis"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
@@ -8661,15 +9691,103 @@ msgstr ""
 "Baum als Basis zu nutzen (Oder klicken sie auf das Bild am Ende des "
 "Eintrags)."
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr "Einträge mit dieser Syntax filtern"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, php-format
 msgid "Select this base"
 msgstr "Diese Basis auswählen"
 
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:173
+#, php-format
+msgid ""
+"Can't rename '%s' to '%s' there is already an entry with the same name in "
+"our zone editing dialog."
+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:200
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
+msgstr "Der Eintragsname '%s' enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:209
+#, 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:215
+#, 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:224
+#, 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:230
+#, 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:247
+#, 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:254
+#, 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:262
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
+msgstr "Es wurde in '%s' ein doppelter Eintrag für '%s' gefunden."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:353
+#, php-format
+msgid "Settings for '%s'"
+msgstr "Einstellungen für '%s'"
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, alle Komponenten dieser DNS-Zone mithilfe "
+"einer einzelnen Liste zu konfigurieren."
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
+msgstr ""
+"Bitte seien Sie vorsichtig, wenn Sie die Eintrags-Typen mit diesem Dialog "
+"bearbeiten. Alle Änderungen werden unverzüglich übernommen, wenn Sie den "
+"'Speichern'-Knopf drücken."
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
+msgstr ""
+"Dieser Dialog kann nicht verwendet werden, bis die momentan geöffnete Zone "
+"gespeichert wurde und/oder der passende Eintrag in der LDAP-Datenbank "
+"existiert."
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
+msgid "To add a new host entry just click here"
+msgstr "Um einen neuen Host-Eintrag hinzuzufügen, klicken Sie einfach hier"
+
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
 "This menu allows you to add, edit or remove selected groups. You may want to "
@@ -8809,43 +9927,43 @@ msgstr "W
 msgid "Object groups"
 msgstr "Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
 msgid "UNIX accounts"
 msgstr "Unix-Konten"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:149
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
 #: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
 #: html/getxls.php:245 html/getxls.php:316
 msgid "Servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
 msgid "Thin Clients"
 msgstr "Thin Clients"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
 msgid "Workstations"
 msgstr "Workstations"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:225
+#: plugins/admin/ogroups/class_ogroupManagement.inc:287
 #, 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:231
-#: plugins/admin/ogroups/class_ogroupManagement.inc:257
+#: plugins/admin/ogroups/class_ogroupManagement.inc:293
+#: plugins/admin/ogroups/class_ogroupManagement.inc:319
 msgid "You are not allowed to delete this object group!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "Create new object group"
 msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
 msgid "Name of object groups"
 msgstr "Name der Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
+#: plugins/admin/ogroups/class_ogroupManagement.inc:550
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Objektgruppe"
@@ -8899,14 +10017,14 @@ msgid "and"
 msgstr "und"
 
 #: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
-msgstr "Unbekannte dn: "
+msgid "Non existing dn:"
+msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
+#: plugins/admin/ogroups/class_ogroup.inc:649
 msgid "There is already an object with this cn."
 msgstr "Diese cn ist bereits vergeben."
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
+#: plugins/admin/ogroups/class_ogroup.inc:666
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
@@ -8926,6 +10044,8 @@ msgstr "Warteschlangen-Einstellungen"
 #: plugins/admin/ogroups/phonequeue.tpl:4
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:4
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
 msgid "Phone numbers"
 msgstr "Telefonnummern"
 
@@ -8934,11 +10054,6 @@ msgstr "Telefonnummern"
 msgid "Generic queue Settings"
 msgstr "Allgemeine Warteschlangen-Einstellungen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:287
-msgid "Down"
-msgstr "Ab"
-
 #: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
 msgstr "Wartezeit"
@@ -9108,35 +10223,35 @@ msgstr ""
 "Diese Gruppe besitzt keine gültigen Warteschlangen-Erweiterung. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 msgid "Timeout must be numeric"
 msgstr "Der Wert für 'Wartezeit' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:204
 msgid "Retry must be numeric"
 msgstr "Der Wert für 'Wiederholen' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:207
 msgid "Max queue length must be numeric"
 msgstr "Der Wert für 'Maximale Grösse der Warteschlange' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:210
 msgid "Announce frequency must be numeric"
 msgstr "Der Wert für 'Benachrichtigungsfrequenz' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:213
 msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:227
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Im Moment ist kein Asterisk-Server definiert. Ihre Einstellungen können "
 "nicht gespeichert werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
+#: plugins/admin/ogroups/class_phonequeue.inc:240
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:244
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -9145,41 +10260,41 @@ msgstr ""
 "MySQL-Server '%s' kann nicht als Benutzer '%s' erreicht werden, überprüfen "
 "Sie das GOsa Protokoll auf MySQL-Fehlermeldungen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:248
-#: plugins/admin/ogroups/class_phonequeue.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:626
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
 #: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:660
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:662
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "Kann Datenbank '%s' auf Server '%s' nicht löschen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
 #: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:411
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:413
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:614
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
+#: plugins/admin/ogroups/class_phonequeue.inc:616
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 #: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:360
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -9208,13 +10323,46 @@ msgstr "W
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:215
-#: plugins/admin/fai/class_faiScriptEntry.inc:83
-#: plugins/admin/fai/class_faiHook.inc:238
-#: plugins/admin/fai/class_faiHookEntry.inc:77
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Herunterladen"
 
+#: plugins/admin/fai/class_faiScript.inc:303
+msgid "Removing FAI script base failed"
+msgstr "Entfernen der FAI-Skript-Basis fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiScript.inc:354
+#, fuzzy
+msgid "Creating FAI script base failed"
+msgstr "Erstelle neues FAI-Objekt - Skript-Gruppe"
+
+#: plugins/admin/fai/class_faiScript.inc:424
+msgid "Removing FAI script failed"
+msgstr "Entfernen des FAI-Skripts fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiScript.inc:443
+msgid "Saving FAI script failed"
+msgstr "Speichern des FAI-Skripts fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiTemplate.inc:325
+#, fuzzy
+msgid "Saving FAI template base failed"
+msgstr "Liste der Vorlagen"
+
+#: plugins/admin/fai/class_faiTemplate.inc:386
+msgid "Removing FAI template base failed"
+msgstr "Entfernen der FAI-Vorlage fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiTemplate.inc:391
+#: plugins/admin/fai/class_faiTemplate.inc:404
+#, fuzzy
+msgid "Saving FAI template failed"
+msgstr "Liste der Vorlagen"
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr "FAI"
@@ -9229,107 +10377,120 @@ msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:318
-#: plugins/admin/fai/class_faiManagement.inc:424
-msgid "Specified branch name is invalid."
-msgstr "Der angegebene Zweigname ist ungültig."
-
-#: plugins/admin/fai/class_faiManagement.inc:378
+#: plugins/admin/fai/class_faiManagement.inc:324
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Sie sind dabei den Zweig / Freeze '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:381
+#: plugins/admin/fai/class_faiManagement.inc:327
 msgid "You are not allowed to delete this release!"
 msgstr "Sie haben keine Berechtigung, dieses Release zu löschen!"
 
-#: plugins/admin/fai/class_faiManagement.inc:643
+#: plugins/admin/fai/class_faiManagement.inc:383
+msgid "Specified branch name is invalid."
+msgstr "Der angegebene Zweigname ist ungültig."
+
+#: plugins/admin/fai/class_faiManagement.inc:385
+msgid "Specified freeze name is invalid."
+msgstr "Der angegebene \"Freeze\"-Name ist ungültig."
+
+#: plugins/admin/fai/class_faiManagement.inc:655
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:663
 msgid "New scripts"
 msgstr "Neue Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:663
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:666
 msgid "New hooks"
 msgstr "Neue Hooks"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:666
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:669
 msgid "New variables"
 msgstr "Neue Variablen"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:669
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:672
 msgid "New templates"
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:672
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:675
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:675
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:681
+#: plugins/admin/fai/class_faiManagement.inc:689
+msgid "This table displays all systems, in the selected tree."
+msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
+
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Name of FAI class"
 msgstr "Name der FAI-Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:682
+#: plugins/admin/fai/class_faiManagement.inc:694
 msgid "Class type"
 msgstr "Typ der Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:686
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:799
+#: plugins/admin/fai/class_faiManagement.inc:804
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_faiManagement.inc:687
+#: plugins/admin/fai/class_faiManagement.inc:699
+#: plugins/admin/fai/class_faiManagement.inc:806
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/fai/class_faiManagement.inc:728
-#: plugins/admin/fai/class_faiManagement.inc:729
-#: plugins/admin/fai/class_faiProfile.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:740
+#: plugins/admin/fai/class_faiManagement.inc:741
+#: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:735
-#: plugins/admin/fai/class_faiManagement.inc:736
+#: plugins/admin/fai/class_faiManagement.inc:747
+#: plugins/admin/fai/class_faiManagement.inc:748
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Package list"
 msgstr "Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:742
-#: plugins/admin/fai/class_faiManagement.inc:743
+#: plugins/admin/fai/class_faiManagement.inc:754
+#: plugins/admin/fai/class_faiManagement.inc:755
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:763
-#: plugins/admin/fai/class_faiManagement.inc:764
+#: plugins/admin/fai/class_faiManagement.inc:775
+#: plugins/admin/fai/class_faiManagement.inc:776
 msgid "Profile"
 msgstr "Profil"
 
@@ -9343,21 +10504,13 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, FAI-Klassen zu erstellen, entfernen und zu "
 "bearbeiten."
 
-#: plugins/admin/fai/headpage.tpl:29
-msgid "Branches"
-msgstr "Zweige"
-
-#: plugins/admin/fai/headpage.tpl:35
-msgid "Current release"
-msgstr "Momentanes Release"
-
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr "Einen neuen Zweig mithilfe des momentanen Releases erstellen"
+msgid "Create new branch"
+msgstr "Neuen Teilbaum erstellen"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr "Erstelle eine gesperrte Version des momentanen Releases"
+msgid "Create new locked branch"
+msgstr "Nicht veränderbaren Teilbaum erzeugen"
 
 #: plugins/admin/fai/headpage.tpl:56
 msgid "Delete current release"
@@ -9439,24 +10592,24 @@ msgstr "Zeige nur Klassen mit Paketen"
 msgid "Show only classes with partitions"
 msgstr "Zeige nur Klassen mit Partitionen"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:62
-#: plugins/admin/fai/class_faiHookEntry.inc:64
+#: plugins/admin/fai/class_faiScriptEntry.inc:68
+#: plugins/admin/fai/class_faiHookEntry.inc:71
 msgid "Please select a valid file."
 msgstr "Bitte wählen Sie eine gültige Datei."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:65
-#: plugins/admin/fai/class_faiHookEntry.inc:67
+#: plugins/admin/fai/class_faiScriptEntry.inc:71
+#: plugins/admin/fai/class_faiHookEntry.inc:74
 msgid "Selected file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:117
-#: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:130
-#: plugins/admin/fai/class_faiTemplateEntry.inc:164
+#: plugins/admin/fai/class_faiScriptEntry.inc:133
+#: plugins/admin/fai/class_faiVariableEntry.inc:102
+#: plugins/admin/fai/class_faiHookEntry.inc:147
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 msgid "Please enter a name."
 msgstr "Bitte geben Sie eine Namen ein."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:121
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
 msgid "Please enter a script."
 msgstr "Bitte geben Sie einen Skript an."
 
@@ -9474,121 +10627,165 @@ msgstr "W
 msgid "Import script"
 msgstr "Skript importieren"
 
-#: plugins/admin/fai/class_faiPackage.inc:291
+#: plugins/admin/fai/class_faiPackage.inc:324
+msgid "Removing FAI package base failed"
+msgstr "Entfernen der FAI-Paket-Basis fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiPackage.inc:353
 msgid "Please select a least one Package."
 msgstr "Bitte wählen Sie mindestens ein Paket."
 
-#: plugins/admin/fai/class_faiPackage.inc:295
+#: plugins/admin/fai/class_faiPackage.inc:357
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
 
-#: plugins/admin/fai/class_faiPackage.inc:316
+#: plugins/admin/fai/class_faiPackage.inc:378
 msgid "package is configured"
 msgstr "Paket ist konfiguriert"
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:402
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Paket '%s' existiert nicht."
 
-#: plugins/admin/fai/faiPackage.tpl:55
+#: plugins/admin/fai/class_faiPackage.inc:461
+msgid "Saving FAI package base failed"
+msgstr "Speichern der FAI-Paket-Basis fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiPackage.inc:506
+msgid "Saving FAI package entry failed"
+msgstr "Speichern des FAI-Paket-Eintrags fehlgeschlagen"
+
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr "Installations-Methode"
+
+#: plugins/admin/fai/faiPackage.tpl:65
 msgid "Used packages"
 msgstr "Verwendete Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:57
+#: plugins/admin/fai/faiPackage.tpl:67
 msgid "Choosen packages"
 msgstr "Gewählte Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:63 include/functions.inc:595
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:569
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plugins/admin/fai/class_faiProfile.inc:272
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr "Diese Liste zeigt alle diesem Profil zugeordneten Klassen-Namen."
 
-#: plugins/admin/fai/class_faiProfile.inc:275
+#: plugins/admin/fai/class_faiProfile.inc:292
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Hook-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:276
+#: plugins/admin/fai/class_faiProfile.inc:293
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Vorlagen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:277
+#: plugins/admin/fai/class_faiProfile.inc:294
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Skript-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:278
+#: plugins/admin/fai/class_faiProfile.inc:295
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Variablen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:279
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Packages bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:283
+#: plugins/admin/fai/class_faiProfile.inc:300
 msgid "Remove class from profile"
 msgstr "Entferne Klasse von Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:351
+#: plugins/admin/fai/class_faiProfile.inc:359
+msgid "Removing FAI profile failed"
+msgstr "Entfernen des FAI-Profils fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiProfile.inc:383
 msgid "Please assign at least one class to this  profile."
 msgstr "Bitte ordnen Sie diesem Profil mindestens eine Klasse zu."
 
-#: plugins/admin/fai/class_faiProfile.inc:355
+#: plugins/admin/fai/class_faiProfile.inc:387
 msgid "Please enter a valid name."
 msgstr "Bitte geben Sie einen gültigen Namen ein."
 
-#: plugins/admin/fai/class_faiProfile.inc:363
+#: plugins/admin/fai/class_faiProfile.inc:395
 msgid "There is already a profile with this class name defined."
 msgstr ""
 "Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
 
+#: plugins/admin/fai/class_faiProfile.inc:429
+msgid "Saving FAI profile failed"
+msgstr "Speichern des FAI-Profils fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiHook.inc:332
+msgid "Removing FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:383
+msgid "Saving FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:451
+msgid "Removing FAI hook failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:457
+#: plugins/admin/fai/class_faiHook.inc:467
+msgid "Saving FAI hook failed"
+msgstr ""
+
 #: plugins/admin/fai/faiProfile.tpl:32
 msgid "FAI classes"
 msgstr "FAI-Klassen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr "Dateisystem"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiSummaryTab.inc:299
 msgid "Mount point"
 msgstr "Mount-Punkt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiSummaryTab.inc:298
 msgid "Size in MB"
 msgstr "Größe in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiSummaryTab.inc:297
 msgid "Mount options"
 msgstr "Mount-Optionen"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
 msgid "FS option"
 msgstr "Dateisystem-Option"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "Preserve"
 msgstr "Bewahren"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
 #, 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:342
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, 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:347
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -9597,32 +10794,32 @@ msgstr ""
 "Dateisystem 'swap' wird bereits benutzt, ändern Sie bitte das Dateisystem "
 "für Partition %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
 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:357
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
 #, 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:367
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
 #, 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:374
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
 #, 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:389
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -9646,11 +10843,7 @@ msgstr "Partition hinzuf
 msgid "List of scripts"
 msgstr "Liste der Skripte"
 
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
-msgstr "Wählen Sie ein Skript zum Entfernen oder Bearbeiten"
-
-#: plugins/admin/fai/class_faiVariableEntry.inc:82
+#: plugins/admin/fai/class_faiVariableEntry.inc:98
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Bitte geben Sie einen Wert für das Attribute 'Inhalt' an."
 
@@ -9666,31 +10859,56 @@ msgstr "Variablen-Inhalt"
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
-#: plugins/admin/fai/faiTemplate.tpl:37
-msgid "Choose a template to delete or edit"
-msgstr "Wählen Sie eine Vorlage zum Entfernen oder Bearbeiten"
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr "FAI-Objekthierarchie"
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr ""
+"Klasse aktualisieren und Konfiguration vom übergeordneten Objekt freigeben."
 
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
 msgstr "Liste der Hook-Skripte"
 
-#: plugins/admin/fai/faiHook.tpl:42
-msgid "Choose a hook to delete or edit"
-msgstr "Wählen Sie einen Hook zum Entfernen oder Bearbeiten"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:231
-#: plugins/admin/fai/class_faiPartitionTable.inc:237
+#: plugins/admin/fai/class_faiPartitionTable.inc:269
+#: plugins/admin/fai/class_faiPartitionTable.inc:275
 #, php-format
 msgid "%s partition"
 msgstr "%s Partition"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:233
-#: plugins/admin/fai/class_faiPartitionTable.inc:239
+#: plugins/admin/fai/class_faiPartitionTable.inc:271
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
 #, php-format
 msgid "%s partition(s)"
 msgstr "%s Partition(en)"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:126
+#: plugins/admin/fai/class_faiPartitionTable.inc:348
+msgid "Saving FAI partition table base failed"
+msgstr "Speichern des FAI-Partitionstabellen-Eintrags fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:390
+#, fuzzy
+msgid "Removing FAI partition table failed"
+msgstr "Neue Partitions-Tabelle"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:398
+#: plugins/admin/fai/class_faiPartitionTable.inc:407
+#, fuzzy
+msgid "Saving FAI partition table failed"
+msgstr "Neue Partitions-Tabelle"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:455
+msgid "Removing FAI partition table entry failed"
+msgstr "Entfernen des FAI-Partitionstabellen-Eintrags fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:464
+#: plugins/admin/fai/class_faiPartitionTable.inc:472
+msgid "Saving FAI partition table entry failed"
+msgstr "Speichern des FAI-Partitionstabellen-Eintrags fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
 
@@ -9715,47 +10933,60 @@ msgstr "Aufgabe"
 msgid "Choose an existing FAI task"
 msgstr "Einen existierenden Task wählen"
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - partition table."
 msgstr "Erstelle neues FAI-Objekt - Partitions-Tabelle"
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - package bundle."
 msgstr "Erstelle neues FAI-Objekt - Paket-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:79
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object - script bundle."
 msgstr "Erstelle neues FAI-Objekt - Skript-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:80
+#: plugins/admin/fai/class_askClassName.inc:84
 msgid "Create new FAI object - variable bundle."
 msgstr "Erstelle neues FAI-Objekt - Variablen-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_askClassName.inc:85
 msgid "Create new FAI object - hook bundle."
 msgstr "Erstelle neues FAI-Objekt - Hook-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_askClassName.inc:86
 msgid "Create new FAI object - profile."
 msgstr "Erstelle neues FAI-Objekt - Profil"
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_askClassName.inc:87
 msgid "Create new FAI object - template."
 msgstr "Erstelle neues FAI-Objekt - Vorlage"
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_askClassName.inc:88
 msgid "Create new FAI object"
 msgstr "Erstelle neues FAI-Objekt"
 
-#: plugins/admin/fai/class_askClassName.inc:137
+#: plugins/admin/fai/class_askClassName.inc:142
 msgid "The given class name is empty."
 msgstr "Der angebene Klassen-Name ist leer."
 
-#: plugins/admin/fai/class_askClassName.inc:141
+#: plugins/admin/fai/class_askClassName.inc:146
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 "Der angegebene Klassen-Name ist für diesen Objekt-Typ bereits in Gebrauch."
 
+#: plugins/admin/fai/class_faiVariable.inc:294
+msgid "Saving FAI variable base failed"
+msgstr "Speichern der FAI-Variablen-Basis fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiVariable.inc:356
+msgid "Removing FAI variable failed"
+msgstr "Entfernen der FAI-Variable fehlgeschlagen"
+
+#: plugins/admin/fai/class_faiVariable.inc:363
+#: plugins/admin/fai/class_faiVariable.inc:375
+msgid "Saving FAI variable failed"
+msgstr "Speichern der FAI-Variablen fehlgeschlagen"
+
 #: plugins/admin/fai/askClassName.tpl:6
 msgid ""
 "Adding a new class to the FAI management, requires a class name. You have to "
@@ -9795,37 +11026,37 @@ msgstr "W
 msgid "A new class name."
 msgstr "Ein neuer Klassen-Name."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:74
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "Es wurden noch keine Datei hochgeladen."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:76
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr "existiert in der Datenbank (Größe: %s Bytes)"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:156
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 msgid "Please specify a value for attribute 'file'."
 msgstr "Bitte geben Sie einen Wert für Attribut 'Datei' an."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:160
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'path'."
 msgstr "Bitte geben Sie einen Wert für Attribut 'Pfad' an."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:168
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a user."
 msgstr "Bitte geben Sie einen Benutzer ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:171
+#: plugins/admin/fai/class_faiTemplateEntry.inc:199
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 "Bitte geben Sie einen gültigen Benutzer ein (0-9 und a-Z sind erlaubt)."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:175
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a group."
 msgstr "Bitte geben Sie eine Gruppe ein."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "Bitte geben Sie eine gültige Gruppe ein (0-9 und a-Z sind erlaubt)."
 
@@ -9842,7 +11073,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -9912,11 +11143,23 @@ msgstr ""
 msgid "Package"
 msgstr "Paket"
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr "Debconf-Information für Paket '%s'"
 
+#: plugins/admin/fai/class_faiSummaryTab.inc:182
+msgid "This object has no FAI classes assigned."
+msgstr "Diesem Objekt sind keine FAI-Klassen zugeordnet."
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:294
+msgid "No."
+msgstr "Nein."
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:296
+msgid "FS options"
+msgstr "Dateisystem-Optionen"
+
 #: plugins/admin/fai/faiPackageNew.tpl:1
 msgid "Repository settings"
 msgstr "Repository-Einstellungen"
@@ -9955,15 +11198,16 @@ msgstr ""
 "Bitte wählen Sie zunächst das gewünschte Release, dann die Section und "
 "abschliessend den Mirror."
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
-msgstr "Die folgenden Releases sind verfügbar"
+#: plugins/admin/fai/faiPackageNew.tpl:26
+#, fuzzy
+msgid "please choose a release..."
+msgstr "Bitte wählen Sie eine gültige Basis."
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/admin/fai/faiPackageNew.tpl:37
 msgid "Sections for this release"
 msgstr "Sections für dieses Release"
 
-#: plugins/admin/fai/faiNewBranch.tpl:3
+#: plugins/admin/fai/faiNewBranch.tpl:5
 msgid ""
 "You are now going to create a branch or locked branch. This action clones "
 "the existing release to another release name. Branches can be modified as "
@@ -9980,10 +11224,28 @@ msgstr ""
 "'scripts', 'hooks', 'partitions', 'variables', 'templates' und 'fai'. Diese "
 "können nicht verwendet werden."
 
-#: plugins/admin/fai/faiNewBranch.tpl:9
+#: plugins/admin/fai/faiNewBranch.tpl:11
 msgid "Please enter a name for the branch"
 msgstr "Bitte geben Sie einen Namen für den Zweig ein"
 
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai 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 FAI-Verwaltungs-"
+"Dialog zu gelangen."
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr "Gewünschte Operation durchführen."
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr "Operation initiieren"
+
 #: plugins/admin/fai/remove_branch.tpl:6
 msgid ""
 "This includes all account data, system access, etc. for this branch. Please "
@@ -9995,10 +11257,12 @@ msgstr ""
 "machen."
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr "Voicemail-PIN"
 
 #: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
@@ -10007,18 +11271,18 @@ msgstr "Telefon-PIN"
 msgid "Phone macro"
 msgstr "Telefon-Makro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 msgid "no macro"
 msgstr "kein Makro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -10029,7 +11293,7 @@ msgstr ""
 "Einstellungen können daher nicht in der Asterisk-Datenbank gespeichert "
 "werden."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
@@ -10037,27 +11301,27 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 msgid "Error while performing query:"
 msgstr "Fehler bei der Ausführung der Anfrage:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr "Dieses Konto besitzt keine Telefon-Erweiterungen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 "Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -10065,12 +11329,12 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -10078,7 +11342,7 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "nicht aktivieren, solange keine gültige UID gesetzt ist."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -10086,19 +11350,19 @@ msgstr ""
 "Dieses Konto besitzt keine gültigen Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:800
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "Die Voicemail-PIN muss 1-4 Zeichen lang sein."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -10106,11 +11370,11 @@ msgstr ""
 "Das Feld 'Voicemail-PIN' enthält ungültige Zeichen. Nur numerische Werte "
 "sind erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:894
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr "Die Telefon-PIN muss mindestens ein Zeichen lang sein."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
@@ -10118,29 +11382,38 @@ msgstr ""
 "Das Feld 'PIN' enthält ungültige Zeichen. Nur alphanumerische Werte sind "
 "erlaubt."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:907
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:914
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Der Parameter '%s' enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
 "verwendet"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 msgid "Stop"
 msgstr "Beenden"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1110
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
+msgid ""
+"Can't remove phone account, the mysql extension is not present in php "
+"configuration."
+msgstr ""
+"Kann das Telefon-Konto nicht entfernen, die MySQL-Erweiterung ist in der PHP-"
+"Konfiguration nicht vorhanden."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Benutzer '%s' von Warteschlange '%s' entfernt."
 
 #: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
@@ -10168,7 +11441,7 @@ msgstr "Zeige Makros, auf die zutrifft"
 
 #: plugins/gofon/macro/headpage.tpl:41
 msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
+msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
 
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 msgid "Macro name"
@@ -10194,37 +11467,37 @@ msgstr "Makro-Inhalt"
 msgid "Phone macros"
 msgstr "Telefon-Makros"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:253
 #, 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:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:259
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:284
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:349
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:353
 msgid "This table displays all phone macros, in the selected tree."
 msgstr "Diese Tabelle enthält alle Telefon-Markos des gewählten Unterbaumes."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:384
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
 msgid "invisible"
 msgstr "unsichtbar"
 
@@ -10270,34 +11543,34 @@ msgstr "Kann DELETE-Abfrage in Datenbank '%s' nicht ausf
 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:357
+#: plugins/gofon/macro/class_gofonMacro.inc:358
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:363
 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:366
+#: plugins/gofon/macro/class_gofonMacro.inc:367
 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:371
+#: plugins/gofon/macro/class_gofonMacro.inc:372
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:377
+#: plugins/gofon/macro/class_gofonMacro.inc:378
 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:382
+#: plugins/gofon/macro/class_gofonMacro.inc:383
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
@@ -10325,19 +11598,19 @@ msgstr "Schalter"
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr "Der Parameter %s besitzt einen ungültigen Wert für Datentyp bool."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -10390,7 +11663,7 @@ msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
 msgid "PIN"
 msgstr "PIN"
 
@@ -10426,27 +11699,27 @@ msgstr "Telefon-Konferenzen"
 msgid "Management"
 msgstr "Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
 msgid "This table displays all available conference rooms."
 msgstr "Diese Tabelle enthält alle verfügbaren Konferenzräume."
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:308
 msgid "Name - Number"
 msgstr "Name - Nummer"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:364
 msgid "Conference"
 msgstr "Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:189
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -10454,24 +11727,24 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:193
 msgid "Please enter a PIN."
 msgstr "Bitte geben Sie eine PIN ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:197
 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:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:201
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Der Wert für 'Nummer' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:205
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Der Wert für 'Lebenszeit' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:235
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:345
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -10573,7 +11846,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:354
+#: include/php_setup.inc:71 html/main.php:366
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -10609,28 +11882,28 @@ msgstr "Zeile"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/functions.inc:290
+#: include/functions.inc:298
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr "Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:311
+#: include/functions.inc:319
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Anmeldung des Nutzers ist fehlgeschlagen. Die Meldung lautet '%s'."
 
-#: include/functions.inc:330
+#: include/functions.inc:338
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr "Die Kennung ist nicht eindeutig. Bitte prüfen Sie die LDAP-Datenbank."
 
-#: include/functions.inc:368
+#: include/functions.inc:376
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 "Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
 
-#: include/functions.inc:378
+#: include/functions.inc:386
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -10640,20 +11913,20 @@ msgstr ""
 "überprüfen Sie den \"Config\" Eintrag in der Datei gosa.conf! Der LDAP-"
 "Server meldete '%s'."
 
-#: include/functions.inc:393
+#: include/functions.inc:401
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers lautet '%s'."
 
-#: include/functions.inc:419
+#: include/functions.inc:427
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann den Zugriffsschutz nicht entfernen. Die Meldung des LDAP-Servers lautet "
 "'%s'."
 
-#: include/functions.inc:449
+#: include/functions.inc:457
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -10661,7 +11934,7 @@ msgstr ""
 "Es kann nicht geprüft werden, ob das Objekt gesperrt ist. Die Parameter sind "
 "nicht korrekt!"
 
-#: include/functions.inc:459
+#: include/functions.inc:467
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -10669,7 +11942,7 @@ msgstr ""
 "Die Information über den Zugriffsschutz kann nicht aus der LDAP-Datenbank "
 "gelesen werden. Bitte prüfen Sie den \"Config\"-Eintrag in der gosa.conf!"
 
-#: include/functions.inc:467
+#: include/functions.inc:475
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -10677,12 +11950,12 @@ msgstr ""
 "Mehrere Sperrungen für ein Objekt gefunden. Dies sollte nicht möglich sein, "
 "bitte entfernen Sie mehrfache Referenzen."
 
-#: include/functions.inc:581
+#: include/functions.inc:555
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:583
+#: include/functions.inc:557
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -10691,11 +11964,24 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:600
+#: include/functions.inc:574
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1031
+#: include/functions.inc:969
+#, php-format
+msgid "Last message repeated %s times."
+msgstr "Letzte Nachricht %s mal wiederholt."
+
+#: include/functions.inc:1043
+msgid "Continue anyway"
+msgstr "Trotzdem Fortsetzen"
+
+#: include/functions.inc:1045
+msgid "Edit anyway"
+msgstr "Trotzdem bearbeiten"
+
+#: include/functions.inc:1047
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -10705,23 +11991,23 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1130
+#: include/functions.inc:1147
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1308
+#: include/functions.inc:1328
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1336
+#: include/functions.inc:1356
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1610
+#: include/functions.inc:1630
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1653
+#: include/functions.inc:1673
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -10753,51 +12039,82 @@ 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:155
+#: include/class_mail-methods-cyrus.inc:157
 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:173
+#: include/class_mail-methods-cyrus.inc:175
 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:195
+#: include/class_mail-methods-cyrus.inc:197
 #, 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:223
+#: include/class_mail-methods-cyrus.inc:225
 #, 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:236
+#: include/class_mail-methods-cyrus.inc:238
 #, 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:307
+#: include/class_mail-methods-cyrus.inc:309
 #, 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:311
+#: include/class_mail-methods-cyrus.inc:313
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
 
-#: include/class_ldap.inc:480
+#: include/class_ldap.inc:195
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+"Der LDAP-Server antwortet sehr langsam (%.2fs für die letzte Anfrage), dies "
+"könnte die Ursache für Leistungseinbrüche sein."
+
+#: include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+"Der LDAP-Server antwortet sehr langsam (%.2f), dies könnte die Ursache für "
+"Leistungseinbrüche sein."
+
+#: include/class_ldap.inc:447
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Erstelle Kopie von %s"
+
+#: include/class_ldap.inc:450
+msgid "Processing"
+msgstr "Verarbeite"
+
+#: include/class_ldap.inc:490
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
+
+#: include/class_ldap.inc:553
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "unbekannter FAI-Status %s"
 
-#: include/class_ldap.inc:594
+#: include/class_ldap.inc:696
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -10806,7 +12123,7 @@ msgstr ""
 "Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
 "unterstützt. Bitte melden Sie dies an das Entwicklerteam."
 
-#: include/class_ldap.inc:856
+#: include/class_ldap.inc:958
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -10815,19 +12132,27 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:971
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
 
-#: include/class_ldap.inc:885
+#: include/class_ldap.inc:987
 #, 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_plugin.inc:465
+#: include/class_plugin.inc:397
+#, php-format
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
+#: include/class_plugin.inc:543
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -10835,7 +12160,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
+#: include/class_plugin.inc:577 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -10843,7 +12168,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:611
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -10851,6 +12176,25 @@ msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
+#: include/class_plugin.inc:917
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "Objekt '%s' ist bereits markiert"
+
+#: include/class_plugin.inc:924
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
+
+#: include/class_plugin.inc:938 include/class_plugin.inc:967
+msgid "Handle object tagging failed"
+msgstr ""
+
+#: include/class_plugin.inc:954
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Entferne Markierung von Objekt '%s'"
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr "Kann SSHA nicht benutzen (Fehlende Funktion mhash / sha1)"
@@ -10892,7 +12236,18 @@ msgstr ""
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr "PPD manager: Der angegebene Pfad '%s' existiert nicht."
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr "Die PPD-Datei '%s' konnte nicht zum Lesen geöffnet werden."
+
+#: include/class_ppdManager.inc:146
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+"Die benötigte temporäre Datei '%s' kann nicht zum Schreiben geöffnet werden."
+
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -10901,45 +12256,45 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - Zeile zu lang. "
 "Nachfolgende Zeichen wurden ausgelassen."
 
-#: include/class_ppdManager.inc:137
+#: include/class_ppdManager.inc:178
 msgid "Nested groups are not supported!"
 msgstr "Verschachtelte Gruppen werden nicht unterstützt!"
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:182
 msgid "Group name not unique!"
 msgstr "Der Gruppenname ist nicht eindeutig!"
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr "Symbolische Werte werden noch nicht unterstützt!"
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr "Verschachtelte Werte werden noch nicht unterstützt."
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr "Die Option PickMany wird noch nicht unterstützt!"
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information "
 "gefunden."
 
-#: include/class_config.inc:69
+#: include/class_config.inc:70
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
 
-#: include/class_config.inc:195 html/index.php:141
+#: include/class_config.inc:196 html/index.php:146
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:450
+#: include/class_config.inc:454
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
@@ -10994,18 +12349,13 @@ msgstr "Kann Datei nicht anlegen/
 msgid "No valid certificate loaded"
 msgstr "Kein gültiges Zertifikat geladen"
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
-msgstr ""
-"Kann den LDAP-Server nicht erreichen: keine Überprüfung der Schemata möglich!"
-
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 "Kann die Schema-Informationen nicht vom Server beziehen: Keine Überprüfung "
 "möglich!"
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -11014,7 +12364,7 @@ msgstr ""
 "Die optionale Objektklasse '%s' (benötigt vom Modul '%s') ist nicht in den "
 "LDAP eingebunden"
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -11022,100 +12372,110 @@ msgstr ""
 "Die optionale Objektklasse '%s' (benötigt vom Modul '%s') hat nicht die "
 "Versionsnummer %s"
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Unterstützung für '%s' aktiviert"
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr "Die benötigte Objektklasse '%s' ist nicht im LDAP vorhanden"
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "Die benötigte Objektklasse '%s' hat nicht die Version %s"
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "SAMBA 3.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr "SAMBA 3 Unterstützung aktiviert"
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "SAMBA 2.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr "SAMBA 2 Unterstützung aktiviert"
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für PureFTPd wurde deaktiviert, das passende Schema ist "
 "nicht installiert"
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr "Unterstützung für PureFTPd aktiviert"
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für WebDAV wurde deaktiviert, das passende Schema ist "
 "nicht installiert."
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr "Unterstützung für WebDAV aktiviert"
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für PHPGroupware wurde deaktiviert, das passende Schema "
 "ist nicht installiert."
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
 msgstr "Unterstützung für PHPGroupware aktiviert"
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für Vertrauensstellungen ist deaktiviert, es wurde kein "
 "passendes Schema gefunden"
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:189
 msgid "Support for trustAccount enabled"
 msgstr "Unterstützung für Vertrauensstellungen aktiviert"
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:194
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für goFon wurde deaktiviert, das passende Schema ist nicht "
 "installiert."
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr "Unterstützung für GOfon aktiviert"
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:204
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 "Die Unterstützung für Nagios wurde deaktiviert, das passende Schema ist "
 "nicht installiert."
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:209
 msgid "Support for nagios enabled"
 msgstr "Unterstützung für Nagios aktiviert"
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:214
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"Die Unterstützung für Netatalk wurde deaktiviert, das passende Schema ist "
+"nicht installiert."
+
+#: include/functions_setup.inc:219
+msgid "Support for netatalk enabled"
+msgstr "Unterstützung für Netatalk aktiviert"
+
+#: include/functions_setup.inc:229
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11123,31 +12483,31 @@ msgstr ""
 "Die Unterstützung für Kolab wurde deaktiviert, das passende Schema ist nicht "
 "installiert. Setze Mail Methode auf cyrus."
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:236
 msgid "Support for Kolab enabled"
 msgstr "Unterstützung für Kolab aktiviert"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr "Überprüfung des PHP-Setups"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Prüfe auf eine PHP-Version (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:279
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11156,11 +12516,11 @@ msgstr ""
 "Funktionen, die in früheren Versionen fehlerhaft oder gar nicht "
 "implementiert waren."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:282
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Prüfe ob register_globals ausgeschaltet ist"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:283
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -11170,40 +12530,55 @@ msgstr ""
 "für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein. "
 "GOsa funktioniert mit beiden möglichen Einstellungen."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr "PHP session.gc_maxlifetime (>= 86400 Sekunden)."
+
+#: include/functions_setup.inc:287
+msgid ""
+"PHP uses this value for the garbage collector to delete old sessions, "
+"setting this value to one day will prevent loosing session and cookie  "
+"before they really timeout."
+msgstr ""
+"PHP verwendet diesen Wert für den Garbage Collector um alte Sitzungen zu "
+"entfernen. Wenn Sie diesen Wert auf einen Tag setzen, wird dies vermeiden, "
+"dass Sie die Sitzung und den zugehörigen Cookie verlieren, bevor diese "
+"tatsächlich ihre Gültigkeit verlieren."
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr "Suche LDAP-Modul"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:294
 msgid "Checking for XML functions"
 msgstr "Prüfe auf XML-Funktionen"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr "Prüfe auf gettext-Erweiterung"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:299
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "Gettext-Unterstützung wird für Übersetzungen benötigt (Anmerkung des "
 "Übersetzers: Da Sie diese Meldung in deutsch lesen können, ist davon "
 "auszugehen, daß ihr PHP gettext-fähig ist)."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:302
 msgid "Checking for iconv support"
 msgstr "Prüfe auf iconv-Erweiterung"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11211,11 +12586,11 @@ msgstr ""
 "Dieses Modul wird von GOsa benutzt, um Informationen der samba-Erweiterung "
 "zu verarbeiten und wird daher benötigt."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:306
 msgid "Checking for mhash module"
 msgstr "Suche mhash-Modul"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:307
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -11223,11 +12598,11 @@ msgstr ""
 "Bei der Verwendung von speziellen Passwort-Verschlüsselungen (wie z.B. SSHA) "
 "wird dieses Modul benötigt. GOsa funktioniert auch ohne dieses Modul."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:310
 msgid "Checking for imap module"
 msgstr "Suche IMAP-Modul"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11235,11 +12610,11 @@ msgstr ""
 "Das IMAP-Modul wird für die Kommunikation mit ihrem IMAP-Server benötigt. "
 "Dort können Benutzer verwaltet und Statusinformationen bezogen werden."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:314
 msgid "Checking for getacl in imap"
 msgstr "Prüfe auf getacl im IMAP-Modul"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:315
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
@@ -11250,20 +12625,20 @@ msgstr ""
 "Zugriffsregeln nicht. Sie benötigen entweder ein angepasstes oder ein recht "
 "aktuelles PHP um diese Funktion nutzen zu können."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:318
 msgid "Checking for mysql module"
 msgstr "Suche MySQL-Modul"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:319
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Das MySQL-Modul wird benötigt, um Fax-Berichte anzuzeigen und auszuwerten."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:322
 msgid "Checking for cups module"
 msgstr "Suche CUPS-Modul"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:323
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11271,11 +12646,11 @@ msgstr ""
 "Falls Sie eine Liste der verfügbaren Drucker über IPP auslesen möchten, "
 "benötigen Sie dieses Modul. Anderenfalls wird die printcap-Datei ausgewertet."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:326
 msgid "Checking for kadm5 module"
 msgstr "Suche kadm5-Modul"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11283,27 +12658,27 @@ msgstr ""
 "Um Benutzer auch im Kerberos verwalten zu können, muß das kadm5-Modul "
 "installiert sein. Sie können es über das PEAR-Netzwerk beziehen."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:330
 msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Simple Network Management Protocol (SNMP) wird zur Client-Überwachung "
 "benötigt."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:367
 msgid "PHP detailed function inspection"
 msgstr "Detaillierte Überprüfung der verwendeten PHP-Funktionen"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, php-format
 msgid "Checking for function %s"
 msgstr "Prüfe Funktion %s"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:372
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11312,37 +12687,37 @@ msgstr ""
 "Die Funktion <b>%s</b> wird von GOsa verwendet. Es gibt derzeit noch keine "
 "Information, ob die Funktion optional ist oder zwingend benötigt wird."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:383
 msgid "Checking for some additional programms"
 msgstr "Suche einige zusätzliche Programme"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Suche nach ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:396
 msgid "Checking imagick module for PHP"
 msgstr "Prüfe auf imagick Erweiterung"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:397
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:404
 msgid "Checking for fping utility"
 msgstr "Suche fping-Programm"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11350,11 +12725,11 @@ msgstr ""
 "Fping wird benötigt, um den Status von Thin-Client basierenden Terminal zu "
 "überwachen."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:420
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Suche einen Weg, um LM/NT Passwort-Hashes zu generieren"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:421
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11362,11 +12737,11 @@ msgstr ""
 "Um Samba 2.x/3.x in Verbindung mit LDAP nutzen zu können, wird ein externes "
 "Programm benötigt, welches die Passwort-Hashes generieren kann."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:434
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini Überprüfung -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:435
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11374,11 +12749,11 @@ msgstr ""
 "Um GOsa fehlerfrei benutzen zu können, muß die Option session.auto_register "
 "in Ihrer php.ini auf 'off' stehen."
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:438
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini Überprüfung -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:439
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11386,11 +12761,11 @@ msgstr ""
 "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
 "diese auf 'off', um die Leistung zu erhöhen."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:446
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini Überprüfung -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:447
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11398,11 +12773,11 @@ msgstr ""
 "Die Ausführungszeit sollte mindestens 30 Sekunden betragen, da einige "
 "Aktionen viel Zeit in Anspruch nehmen."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:454
 msgid "php.ini check -> memory_limit"
 msgstr "php.ini Überprüfung -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:455
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -11411,11 +12786,11 @@ msgstr ""
 "unvorhersehbare Probleme verursachen! Bei größeren Installationen sollte "
 "dieser Wert noch erweitert werden."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:459
 msgid "php.ini check -> expose_php"
 msgstr "php.ini Überprüfung -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:460
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
@@ -11424,11 +12799,11 @@ msgstr ""
 "setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
 "laufenden Server senden."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:464
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini Überprüfung -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:465
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11436,11 +12811,11 @@ msgstr ""
 "Erhöhen Sie die Sicherheit des Server, indem sie magic_quotes_gpc auf 'on' "
 "stellen. PHP wird in dieser Einstellung alle 'quotes' in 'strings' umwandeln."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:711
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Sie müssen einen LDAP-Server angeben um fortzufahren!"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:720 include/functions_setup.inc:803
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -11448,8 +12823,8 @@ msgstr ""
 "Kann den angegebenen LDAP-Server nicht erreichen! Bitte stellen Sie sicher, "
 "dass er für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -11457,7 +12832,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:844
+#: include/functions_setup.inc:823
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
@@ -11465,7 +12840,7 @@ msgstr ""
 "Die Verbindung zum Server war erfolgreich, dieser scheint jedoch leer zu "
 "sein. Bitte überprüfen Sie nochmals Ihre Angaben."
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:879
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -11474,7 +12849,7 @@ msgstr ""
 "Das Attribut '%s' ist in diesem Formular nicht angegeben. Bitte "
 "vervollständigen Sie Ihre Eingaben!"
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:910
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -11482,14 +12857,14 @@ msgstr ""
 "Kann von GOsa benötigte Schema-Informationen nicht lesen. Bitte stellen Sie "
 "sicher, dass diese lesbar sind."
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:919
 #, php-format
 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:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:181
+#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
+#: include/functions_setup.inc:1061 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -11526,20 +12901,51 @@ msgstr "%s Ergebnisse f
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
 
-#: include/class_debconfTemplate.inc:251
+#: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
+"Konnte die Reverse-Zone für DNS-Zone '%s' nicht finden. Das Einlesen wurde "
+"abgebrochen."
+
+#: include/functions_dns.inc:171
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+"Es wurde mehr als eine Reverse-Zone für DNS-Zone '%s' gefunden. Das Einlesen "
+"wurde abgebrochen."
+
+#: include/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
+msgstr ""
+"Es wurde mehr als eine DNS-Zone gefunden, die einen Eintrag mit Namen '%s' "
+"enthält. Der Vorgang, Informationen über dieses Gerät zu beschaffen, wurde "
+"daher abgebrochen."
+
+#: include/class_CopyPasteHandler.inc:152
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Sie kopieren gerade den Eintrag %s."
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 "Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
 
-#: html/helpviewer.php:116
+#: html/helpviewer.php:113
 msgid "There is no helpfile specified for this class."
 msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
 
-#: html/helpviewer.php:226
+#: html/helpviewer.php:223
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -11567,7 +12973,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:149
+#: html/main.php:160
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -11575,18 +12981,18 @@ msgstr ""
 "'Register globals' ist im PHP aktiviert. GOsa läßt keine Anmeldung zu, bis "
 "dies von einem Administrator behoben wurde."
 
-#: html/main.php:192
+#: html/main.php:203
 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:332
+#: html/main.php:338
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Es kann kein Plugin für die Definition '%s' gefunden werden!"
 
-#: html/main.php:354
+#: html/main.php:366
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -11604,19 +13010,19 @@ msgstr "Kann Datei '%s' 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:54
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "Die Konfigurationsdatei %s/gosa.conf ist nicht lesbar. Abgebrochen."
 
-#: html/index.php:71
+#: html/index.php:76
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/index.php:154
+#: html/index.php:159
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -11624,33 +13030,41 @@ msgstr ""
 "GOsa kann keine Informationen über die verfügbaren Schema-Definitionen "
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
-#: html/index.php:162
+#: html/index.php:167
 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:189
+#: html/index.php:194
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:191
+#: html/index.php:196
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:198
+#: html/index.php:203
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:236 html/index.php:296
+#: html/index.php:244 html/index.php:308
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:236 html/index.php:296
+#: html/index.php:244 html/index.php:308
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
+#: html/index.php:250
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr ""
+"Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies "
+"und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
+
 #: html/getxls.php:65
 msgid "Birthday"
 msgstr "Geburtstag"
@@ -11819,15 +13233,15 @@ msgstr ""
 "i> an"
 
 #: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
 msgid "Click here to log in"
 msgstr "Hier klicken zum Anmelden"
 
@@ -12220,10 +13634,6 @@ msgstr ""
 "Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
 "einen Klick auf <i>Trotzdem bearbeiten</i> übergehen."
 
-#: ihtml/themes/default/islocked.tpl:13
-msgid "Edit anyway"
-msgstr "Trotzdem bearbeiten"
-
 #: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
@@ -12259,3 +13669,89 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Erneut anmelden"
 
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr "Kopieren &amp; Einfügen - Assistent"
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
+msgid ""
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
+msgstr ""
+"Bestimmte Werte müssen im gesamten Verzeichnis eindeutig sein, während "
+"andere Kombinationen keinen Sinn ergeben. GOsa zeigt die relevanten "
+"Attribute. Bitte verwalten Sie die Werte, die unten angezeigt werden, um die "
+"Auflagen zu erfüllen."
+
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+msgid "Operation complete"
+msgstr "Vorgang abgeschlossen"
+
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr "Ihr Passwort ist abgelaufen, geben Sie bitte ein neues Passwort ein"
+
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
+msgstr "Altes Passwort"
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
+msgstr "Passwort überprüfen"
+
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
+msgstr "Hier klicken, um Ihr Passwort zu ändern"
+
+#~ msgid ""
+#~ "This menu allows you to add, edit and remove selected groups. You may "
+#~ "want to use the range selector on top of the group listbox, when working "
+#~ "with a large number of groups."
+#~ msgstr ""
+#~ "Dieses Menü erlaubt es Ihnen Gruppen, hinzuzufügen, zu bearbeiten oder zu "
+#~ "entfernen. Bei einer großen Anzahl von Gruppen bietet sich die Verwendung "
+#~ "der Bereichsauswahl an."
+
+#~ msgid "Groupname"
+#~ msgstr "Name der Gruppe"
+
+#~ msgid "This table displays all users, in the selected tree."
+#~ msgstr "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
+
+#~ msgid "System"
+#~ msgstr "Systeme"
+
+#~ msgid "Set root password"
+#~ msgstr "root-Passwort setzen"
+
+#~ msgid "User name of which terminal(s) are shown"
+#~ msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
+
+#~ msgid "Please select a valid ppd."
+#~ msgstr "Bitte wählen Sie eine gültige PPD."
+
+#~ msgid "Inherit settings from this object group"
+#~ msgstr "Einstellungen von dieser Objekt-Gruppe übernehmen"
+
+#~ msgid "Following releases are available"
+#~ msgstr "Die folgenden Releases sind verfügbar"
+
+#~ msgid " Please choose another name."
+#~ msgstr "Bitte wÀhlen Sie einen anderen Namen."
+
+#~ msgid "Can't bind to LDAP. No schema check possible!"
+#~ msgstr ""
+#~ "Kann den LDAP-Server nicht erreichen: keine Ã\9cberprÃŒfung der Schemata "
+#~ "möglich!"