Updated copy & paste

[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 5525e901ada801a3871635a33a58c1d1f462ec97..9cb4e622a5d84500020f22a5ff2286aa10f9b645 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1,19 +1,18 @@
 # translation of messages.po to
+# Alfred Schroeder <schroeder@GONICUS.de>, 2004.
+# Cajus Pollmeier <pollmeier@gonicus.de>, 2004, 2005, 2006.
+# Jan Wenzel <jan.wenzel@gonicus.de>, 2004,2005.
+# Stefan Koehler <stefan.koehler@GONICUS.de>, 2005.
 # translation of messages.po to Deutsch
-# translation of messages.po to de_DE
 # GOsa2 Translations
 # Copyright (C) 2003 GONICUS GmbH, Germany
 # This file is distributed under the same license as the GOsa2 package.
-# Alfred Schroeder <schroeder@GONICUS.de>, 2004.
-# Cajus Pollmeier <pollmeier@gonicus.de>, 2004, 2005.
-# Jan Wenzel <jan.wenzel@gonicus.de>, 2004,2005.
-# Stefan Koehler <stefan.koehler@GONICUS.de>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2005-11-25 15:12+0100\n"
+"PO-Revision-Date: 2006-03-31 15:04+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,15 +27,15 @@ msgstr "Mein Konto"
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:51
+#: contrib/gosa.conf:57
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: contrib/gosa.conf:70 contrib/gosa.conf:83 contrib/gosa.conf:92
-#: contrib/gosa.conf:98 contrib/gosa.conf:103 contrib/gosa.conf:109
-#: contrib/gosa.conf:118 contrib/gosa.conf:127 contrib/gosa.conf:136
-#: contrib/gosa.conf:141 contrib/gosa.conf:146 contrib/gosa.conf:151
-#: contrib/gosa.conf:156 contrib/gosa.conf:161
+#: contrib/gosa.conf:74 contrib/gosa.conf:87 contrib/gosa.conf:96
+#: contrib/gosa.conf:102 contrib/gosa.conf:107 contrib/gosa.conf:113
+#: contrib/gosa.conf:122 contrib/gosa.conf:138 contrib/gosa.conf:147
+#: contrib/gosa.conf:152 contrib/gosa.conf:157 contrib/gosa.conf:162
+#: contrib/gosa.conf:167 contrib/gosa.conf:172
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -51,150 +50,175 @@ msgstr "Zus
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
 #: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:75
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:72 contrib/gosa.conf:84
+#: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:378
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Umgebung"
 
-#: contrib/gosa.conf:73 contrib/gosa.conf:86
+#: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:732
-#: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:161
-#: plugins/admin/ogroups/class_ogroupManagement.inc:383
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/tabs_ogroups.inc:72
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
-#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:738
+#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:135
+#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: contrib/gosa.conf:76 plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:379
+#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:736
-#: plugins/admin/departments/generic.tpl:62 html/getxls.php:174
+#: plugins/admin/users/class_userManagement.inc:865
+#: 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:77 plugins/personal/generic/generic.tpl:231
-#: plugins/personal/generic/generic.tpl:369
+#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:734
-#: plugins/admin/departments/generic.tpl:58
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/ogroups/class_ogroupManagement.inc:61
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefon"
 
-#: contrib/gosa.conf:78 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:88 contrib/gosa.conf:94
-#: contrib/gosa.conf:99 contrib/gosa.conf:105 contrib/gosa.conf:114
-#: contrib/gosa.conf:123 contrib/gosa.conf:132 contrib/gosa.conf:137
-#: contrib/gosa.conf:142 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:157 contrib/gosa.conf:162
+#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:98
+#: contrib/gosa.conf:103 contrib/gosa.conf:109 contrib/gosa.conf:118
+#: contrib/gosa.conf:134 contrib/gosa.conf:143 contrib/gosa.conf:148
+#: contrib/gosa.conf:153 contrib/gosa.conf:158 contrib/gosa.conf:163
+#: contrib/gosa.conf:168 contrib/gosa.conf:173
 msgid "References"
 msgstr "Referenzen"
 
-#: contrib/gosa.conf:85
+#: contrib/gosa.conf:89
 #: 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:87
+#: contrib/gosa.conf:91
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: contrib/gosa.conf:93 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
 #: plugins/admin/systems/printerPPDDialog.tpl:17
+#: 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:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:653
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:110 contrib/gosa.conf:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:93
+#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
-msgstr "Starten"
+msgstr "Start"
 
-#: contrib/gosa.conf:111 contrib/gosa.conf:129
-#: plugins/admin/ogroups/tabs_ogroups.inc:97
+#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:112 contrib/gosa.conf:130
-#: plugins/personal/environment/environment.tpl:168
-#: plugins/admin/systems/class_systemManagement.inc:714
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: plugins/personal/environment/environment.tpl:172
+#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/ogroups/class_ogroupManagement.inc:62
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:113 contrib/gosa.conf:122 contrib/gosa.conf:131
+#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/fai/faiProfileEntry.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/servRepository.tpl:24
+#: plugins/admin/systems/glpiSelectUser.tpl:20
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/glpiAttachmentPool.tpl:20
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
+#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:22
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:119
+#: contrib/gosa.conf:123
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+msgid "Repository"
+msgstr "Repository"
+
+#: contrib/gosa.conf:183
+msgid "OGo"
+msgstr "OGo"
+
+#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -203,86 +227,86 @@ msgstr "Dienste"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:196
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/addons/ldapmanager/contentcsv.tpl:117
-#: plugins/addons/ldapmanager/contentcsv.tpl:120
-#: plugins/admin/applications/generic.tpl:91
+#: plugins/addons/ldapmanager/contentcsv.tpl:109
+#: plugins/addons/ldapmanager/contentcsv.tpl:112
+#: plugins/admin/applications/generic.tpl:95
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:198
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:202
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:188 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
-#: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/generic.tpl:93
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:551
-#: plugins/admin/fai/class_faiManagement.inc:552
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:544
-#: plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:565
-#: plugins/admin/fai/class_faiManagement.inc:566
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:208
+#: contrib/gosa.conf:226
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:248
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:243 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:267
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:268
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:269
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:247
+#: contrib/gosa.conf:270
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:271
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:249
+#: contrib/gosa.conf:272
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -300,20 +324,20 @@ msgstr "Italienisch"
 #: plugins/personal/connectivity/class_phpgwAccount.inc:6
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
 #: plugins/addons/addressbook/class_addressbook.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/ldapmanager/class_csvimport.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/ldapmanager/class_import.inc:7
 #: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
@@ -323,7 +347,7 @@ msgstr "Italienisch"
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7
 msgid "This does something"
 msgstr "Dies tut etwas"
 
@@ -355,16 +379,16 @@ 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:163
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:166
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
 msgid "The required field 'NagiosMail' is not set."
 msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:170
-#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
 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."
@@ -374,25 +398,26 @@ msgstr ""
 #: plugins/personal/environment/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:115
+#: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:390
-#: plugins/admin/groups/class_groupManagement.inc:331
-#: plugins/admin/users/class_userManagement.inc:633
-#: plugins/admin/applications/class_applicationManagement.inc:304
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:539
-#: plugins/admin/ogroups/class_ogroupManagement.inc:339
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:303
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
+#: plugins/admin/systems/class_systemManagement.inc:720
+#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
+#: ihtml/themes/default/copyPasteDialog.tpl:20
 msgid "Finish"
 msgstr "Speichern"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:112
 #: plugins/personal/samba/samba3_workstations.tpl:41
@@ -403,54 +428,73 @@ msgstr "Speichern"
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
 #: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:117
+#: plugins/personal/connectivity/main.inc:120
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/admin/fai/class_faiManagement.inc:392
-#: plugins/admin/fai/class_faiManagement.inc:397
-#: plugins/admin/fai/faiProfileEntry.tpl:72
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
+#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
+#: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiPackageNew.tpl:66
+#: plugins/admin/fai/faiPackageNew.tpl:45
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:64 plugins/admin/fai/remove.tpl:17
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:133
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiHookEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiNewBranch.tpl:20
+#: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/group_objects.tpl:49
+#: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:635
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:16
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:306
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:541
-#: plugins/admin/systems/servnfs.tpl:92 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/glpi_edit_type.tpl:29
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/servdnseditzone.tpl:122
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/SelectDeviceType.tpl:45
+#: 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:341
+#: plugins/admin/ogroups/class_ogroupManagement.inc:402
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
-#: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:274
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:13
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -458,9 +502,9 @@ msgstr "Abbrechen"
 #: plugins/personal/posix/main.inc:120 plugins/personal/samba/main.inc:114
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
-#: plugins/personal/connectivity/main.inc:125
+#: plugins/personal/connectivity/main.inc:128
 #: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
+#: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
@@ -468,19 +512,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
-#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:44
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/gofon/phoneaccount/main.inc:112
+#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
+#: plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -496,13 +548,14 @@ msgstr "Nagios-Konto"
 msgid "Alias"
 msgstr "Alias"
 
-#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:174
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
 #: plugins/personal/nagios/nagios.tpl:17
 msgid "Host notification period"
-msgstr "Frequenz der System-Meldungen"
+msgstr "Frequenz der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:25
 msgid "Service notification period"
@@ -510,16 +563,16 @@ msgstr "Frequenz der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:32
 msgid "Service notification options"
-msgstr "Optionen für Dienst-Meldungen"
+msgstr "Optionen der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:41
 msgid "Host notification options"
-msgstr "Optionen für System-Meldungen"
+msgstr "Optionen der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:242
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:102 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Pager"
 msgstr "Pager"
@@ -530,7 +583,7 @@ msgstr "Befehle f
 
 #: plugins/personal/nagios/nagios.tpl:57
 msgid "Host notification commands"
-msgstr "Befehle für System-Meldungen"
+msgstr "Befehle für Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:66
 msgid "Nagios authentification"
@@ -564,61 +617,67 @@ msgstr "Alle Dienst-Befehle ausf
 msgid "trigger all host commands"
 msgstr "Alle Host-Befehle ausführen"
 
-#: 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:55 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:709
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:922
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
 
-#: plugins/personal/mail/generic.tpl:13
+#: plugins/personal/mail/generic.tpl:14
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto verwaltet werden soll"
+msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto angelegt werden soll"
 
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Kontingent-Nutzung"
 
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:150
-#: plugins/admin/systems/class_printGeneric.inc:367
+#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "nicht definiert"
 
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:35
+#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:45
+#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:38
+#: 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:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/mail/copypaste.tpl:21
+#: plugins/personal/mail/copypaste.tpl:44
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/samba/samba3.tpl:307
+#: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:117
-#: plugins/personal/environment/environment.tpl:134
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/environment/environment.tpl:137
+#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/gofax/blocklists/generic.tpl:63
@@ -626,40 +685,59 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:74
-#: plugins/admin/fai/class_faiProfile.inc:153
-#: plugins/admin/fai/faiProfile.tpl:37 plugins/admin/fai/faiScript.tpl:43
-#: plugins/admin/fai/faiTemplate.tpl:40 plugins/admin/fai/faiHook.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
+#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:413
-#: plugins/admin/groups/application.tpl:14
-#: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/groups/generic.tpl:103
+#: plugins/admin/groups/class_groupMail.inc:533
+#: plugins/admin/groups/application.tpl:15
+#: plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/generic.tpl:104
 #: 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/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:50
-#: plugins/admin/systems/workstationStartup.tpl:70
-#: plugins/admin/systems/workstationStartup.tpl:89
+#: plugins/admin/systems/workstationStartup.tpl:57
+#: plugins/admin/systems/workstationStartup.tpl:77
+#: plugins/admin/systems/workstationStartup.tpl:96
+#: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
-#: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:80
+#: plugins/admin/systems/terminalStartup.tpl:57
+#: plugins/admin/systems/terminalStartup.tpl:76
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpiManufacturer.tpl:6
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/class_termDNS.inc:416
+#: plugins/admin/systems/class_termDNS.inc:436
+#: plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/class_servDNSeditZone.inc:476
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:387
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:14
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/copypaste.tpl:23
+#: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:309
-#: plugins/personal/environment/environment.tpl:135
-#: plugins/personal/environment/environment.tpl:162
-#: plugins/personal/environment/environment.tpl:178
+#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:166
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -667,139 +745,229 @@ msgstr "Hinzuf
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiHook.tpl:45
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
+#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
-#: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:105
-#: plugins/admin/users/remove.tpl:14 plugins/admin/applications/remove.tpl:13
+#: plugins/admin/groups/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/workstationStartup.tpl:51
-#: plugins/admin/systems/workstationStartup.tpl:71
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/workstationStartup.tpl:58
+#: plugins/admin/systems/workstationStartup.tpl:78
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
 #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/terminalStartup.tpl:62
+#: plugins/admin/systems/terminalStartup.tpl:58
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/class_termDNS.inc:430
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:470
 #: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Entfernen"
 
-#: plugins/personal/mail/generic.tpl:66
+#: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr "Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 "Wählen Sie diese Einstellung, wenn Mails lediglich weitergeleitet werden "
-"sollen. Eine lokale Kopie wird nicht gespeichert."
+"sollen, ohne eine lokale Kopie zu speichern."
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "Wählen Sie dies, um automatisch eine Urlaubsmeldung zu generieren"
+msgstr ""
+"Wählen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen "
+"Text zu versenden."
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Wählen Sie dies, um Mails von Spamassassin filtern zu lassen"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verschiebe Mails mit einem SPAM-Level größer als"
 
-#: plugins/personal/mail/generic.tpl:83
+#: plugins/personal/mail/generic.tpl:84
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:87
 msgid "to folder"
 msgstr "in den Ordner"
 
-#: plugins/personal/mail/generic.tpl:93
+#: plugins/personal/mail/generic.tpl:94
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen, die größer sind als"
 
-#: plugins/personal/mail/generic.tpl:95
-#: plugins/personal/environment/environment.tpl:71
-#: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/mail/generic.tpl:96
+#: plugins/personal/environment/environment.tpl:45
+#: plugins/personal/connectivity/pureftpd.tpl:44
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:102
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/copypaste.tpl:22
 #: 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"
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
-"Wählen Sie dies wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
+"Wählen Sie dies, wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
 "und empfangen darf"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:146
 msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr "Benutzer Mail-Einstellungen"
+
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+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/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/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
+#: plugins/admin/groups/headpage.tpl:30
+#: 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:47
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:31
+msgid "Filters"
+msgstr "Filter"
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
+#: 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:40
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: 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"
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr "Zeige Adressen des Benutzers"
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr "Benutzername, dessen Adressen angezeigt werden"
+
 #: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
+#: 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:170
+#: plugins/personal/mail/class_mailAccount.inc:176
 msgid "No DESC tag in vacation file:"
 msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
 
-#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/personal/mail/class_mailAccount.inc:216
 msgid "This account has no mail extensions."
 msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
-#: plugins/personal/mail/class_mailAccount.inc:219
-#: plugins/admin/groups/class_groupMail.inc:195
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: 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:220
-#: plugins/admin/groups/class_groupMail.inc:196
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -807,14 +975,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:222
-#: plugins/admin/groups/class_groupMail.inc:198
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: 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:222
-#: plugins/admin/groups/class_groupMail.inc:199
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -822,163 +990,104 @@ 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:270
+#: plugins/personal/mail/class_mailAccount.inc:276
 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:276
-#: plugins/admin/groups/class_groupMail.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:282
+#: 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:311
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: 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:326
-#: plugins/admin/groups/class_groupMail.inc:291
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: 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:700
+#: plugins/personal/mail/class_mailAccount.inc:714
 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:705
-#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:804
 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:709
-#: plugins/personal/mail/class_mailAccount.inc:713
-#: plugins/addons/addressbook/class_addressbook.inc:585
+#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
 #: plugins/admin/ogroups/class_mailogroup.inc:70
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/personal/mail/class_mailAccount.inc:720
-#: plugins/admin/groups/class_groupMail.inc:628
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:813
 #: plugins/admin/ogroups/class_mailogroup.inc:77
 msgid "The primary address you've entered is already in use."
 msgstr ""
 "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:726
-#: plugins/admin/groups/class_groupMail.inc:634
+#: plugins/personal/mail/class_mailAccount.inc:739
+#: plugins/admin/groups/class_groupMail.inc:819
 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:735
-#: plugins/admin/groups/class_groupMail.inc:643
+#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/admin/groups/class_groupMail.inc:828
 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:745
-#: plugins/admin/groups/class_groupMail.inc:651
+#: plugins/personal/mail/class_mailAccount.inc:758
+#: plugins/admin/groups/class_groupMail.inc:836
 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:749
+#: plugins/personal/mail/class_mailAccount.inc:762
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr "Benutzer Mail-Einstellungen"
-
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-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/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/fai/faiProfileEntry.tpl:32
-#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
-#: plugins/admin/groups/headpage.tpl:30
-#: 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/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:20
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filter"
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: 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/mail_locals.tpl:33
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: 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"
-
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
-msgstr "Zeige Adressen des Benutzers"
-
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr "Benutzername, dessen Adressen angezeigt werden"
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
+msgstr "Mail-Einstellungen"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:660
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: 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:109 plugins/admin/systems/servdb.tpl:128
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/default/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
 msgid "Password"
 msgstr "Passwort"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -1036,11 +1145,14 @@ msgstr ""
 "Programme anzupassen, die dieses Passwort auch benutzen."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
+#: plugins/personal/generic/main.inc:169
+#: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1311
+#: plugins/addons/ldapmanager/contentcsv.tpl:114
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1383
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1067,7 +1179,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:264
+#: plugins/admin/users/class_userManagement.inc:351
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1076,7 +1188,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:269
+#: plugins/admin/users/class_userManagement.inc:356
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
@@ -1102,81 +1214,27 @@ msgstr "Das externe Passwort-
 msgid "Select groups to add"
 msgstr "Wählen Sie die hinzuzufügenden Gruppen"
 
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:40
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
-
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Show primary groups"
-msgstr "Zeige primäre Gruppen"
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:44
-msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:45
-msgid "Show samba groups"
-msgstr "Zeige Samba-Gruppen"
-
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:48
-msgid "Select to see groups that have applications configured"
-msgstr "Auswählen, um die Gruppen zu sehen, denen Anwendungen zugeordnet sind"
-
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
-msgid "Show application groups"
-msgstr "Zeige Anwendungs-Gruppen"
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:52
-msgid "Select to see groups that have mail settings"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen E-Mail-Eigenschaften zugeordnet "
-"sind"
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:53
-msgid "Show mail groups"
-msgstr "Zeige E-Mail-Gruppen"
-
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:56
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
-
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:57
-msgid "Show functional groups"
-msgstr "Zeige Funktions-Gruppen"
-
-#: plugins/personal/posix/posix_groups.tpl:36
 msgid "Display groups of department"
 msgstr "Zeige Gruppen der Abteilung"
 
-#: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:41
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Zeige Gruppen, auf die zutrifft"
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:44
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Regulärer Ausdruck zum Suchen in Gruppennamen"
 
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:73
+#: plugins/personal/posix/posix_groups.tpl:51
+#: plugins/admin/groups/headpage.tpl:75
 msgid "Display groups of user"
 msgstr "Zeige Gruppen des Benutzers"
 
-#: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/personal/posix/posix_groups.tpl:54
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Benutzername, dessen Gruppen angezeigt werden"
 
@@ -1185,7 +1243,7 @@ msgid "User must change password on first login"
 msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort ändern"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:245
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
@@ -1202,9 +1260,10 @@ msgstr "Zeige die Systeme der Abteilung"
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:85
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/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:640
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -1216,20 +1275,26 @@ msgstr "Shell"
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
+#: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
 msgstr "Status"
 
 #: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:21
 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:26 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/paste_generic.tpl:35
 msgid "GID"
 msgstr "GID"
 
@@ -1258,32 +1323,33 @@ msgstr "Vertrauens-Modus"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:137
+#: plugins/personal/posix/class_posixAccount.inc:993
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:177
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:191
-#: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/admin/systems/class_workstationService.inc:107
+#: plugins/personal/posix/class_posixAccount.inc:195
+#: plugins/admin/systems/class_terminalService.inc:141
+#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationStartup.inc:657
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:222
+#: plugins/personal/posix/class_posixAccount.inc:227
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto besitzt keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:243
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:251
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:249
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1291,7 +1357,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte UNIX-Erweiterungen. Um sie zu deaktivieren, "
 "müssen Sie zunächst die Samba- und Umgebungserweiterungen deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1299,11 +1365,11 @@ msgstr ""
 "Dieses Konto besitzt aktivierte UNIX-Erweiterungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:250
+#: plugins/personal/posix/class_posixAccount.inc:255
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:256
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1311,247 +1377,247 @@ msgstr ""
 "Dieses Konto besitzt keine aktivierten UNIX-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:457
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Der Benutzer muß sein Passwort nach %s Tagen ändern"
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr "Konto nach %s Tagen nach Ablauf ohne Aktivität deaktivieren"
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:461
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/posix/class_posixAccount.inc: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/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:292
-#: plugins/gofon/reports/class_fonreport.inc:222
+#: 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:465
+#: 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/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:292
-#: plugins/gofon/reports/class_fonreport.inc:222
+#: 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:465
+#: 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/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:292
-#: plugins/gofon/reports/class_fonreport.inc:222
+#: 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:465
+#: 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/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:292
-#: plugins/gofon/reports/class_fonreport.inc:222
+#: 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:466
+#: 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/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:293
-#: plugins/gofon/reports/class_fonreport.inc:223
+#: 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:466
+#: 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/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:293
-#: plugins/gofon/reports/class_fonreport.inc:223
+#: 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:466
+#: 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/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:293
-#: plugins/gofon/reports/class_fonreport.inc:223
+#: 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:466
+#: 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/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:293
-#: plugins/gofon/reports/class_fonreport.inc:223
+#: 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:466
+#: 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/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:294
-#: plugins/gofon/reports/class_fonreport.inc:224
+#: 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:467
+#: 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/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:294
-#: plugins/gofon/reports/class_fonreport.inc:224
+#: 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:467
+#: 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/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:294
-#: plugins/gofon/reports/class_fonreport.inc:224
+#: 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:467
+#: 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/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:294
-#: plugins/gofon/reports/class_fonreport.inc:224
+#: 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:548
+#: plugins/personal/posix/class_posixAccount.inc:569
 #: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:569
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:549
+#: plugins/personal/posix/class_posixAccount.inc:570
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/personal/posix/class_posixAccount.inc:718
+#: plugins/personal/posix/class_posixAccount.inc:742
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "The required field 'Home directory' is not set."
 msgstr "Das benötigte Feld 'Basisverzeichnis' ist nicht gesetzt."
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
-#: plugins/personal/posix/class_posixAccount.inc:888
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'UID' is not valid."
 msgstr "Die von ihnen angebene 'UID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:921
 msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:895
-#: plugins/admin/groups/class_groupGeneric.inc:657
+#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/admin/groups/class_groupGeneric.inc:768
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:898
-#: plugins/admin/groups/class_groupGeneric.inc:660
+#: plugins/personal/posix/class_posixAccount.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:771
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMin' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:941
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMax' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowWarning' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:949
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/personal/posix/class_posixAccount.inc:955
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowInactive' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:933
+#: plugins/personal/posix/class_posixAccount.inc:963
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:968
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr "Der angegebene Wert 'shadowMin' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:1042
-#: plugins/admin/groups/class_groupGeneric.inc:691
+#: plugins/personal/posix/class_posixAccount.inc:1095
+#: plugins/admin/groups/class_groupGeneric.inc:807
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
@@ -1561,6 +1627,10 @@ msgstr ""
 msgid "Unix settings"
 msgstr "UNIX-Einstellungen"
 
+#: 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"
@@ -1570,20 +1640,20 @@ msgid "Script path"
 msgstr "Anmeldeskript"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:95
-#: plugins/personal/samba/class_sambaAccount.inc:634
+#: plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/class_sambaAccount.inc:641
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:230
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
 msgid "Access options"
 msgstr "Zugriffsoptionen"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:236
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
 msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
@@ -1599,91 +1669,91 @@ msgstr "Dom
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: plugins/personal/samba/samba3.tpl:82
+#: plugins/personal/samba/samba3.tpl:91
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: plugins/personal/samba/samba3.tpl:107
+#: plugins/personal/samba/samba3.tpl:118
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
-#: plugins/personal/samba/samba3.tpl:110
+#: plugins/personal/samba/samba3.tpl:121
 msgid "Initial program"
 msgstr "Startprogramm"
 
-#: plugins/personal/samba/samba3.tpl:116
+#: plugins/personal/samba/samba3.tpl:131
 msgid "Working directory"
 msgstr "Arbeitsverzeichnis"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:153
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: plugins/personal/samba/samba3.tpl:136
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/samba3.tpl:158
+#: plugins/personal/samba/class_sambaAccount.inc:648
 msgid "Connection"
 msgstr "Verbinden"
 
-#: plugins/personal/samba/samba3.tpl:145
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/samba3.tpl:167
+#: plugins/personal/samba/class_sambaAccount.inc:649
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: plugins/personal/samba/samba3.tpl:154
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:176
+#: plugins/personal/samba/class_sambaAccount.inc:650
 msgid "IDLE"
 msgstr "Leerlauf"
 
-#: plugins/personal/samba/samba3.tpl:167
+#: plugins/personal/samba/samba3.tpl:189
 msgid "Client devices"
 msgstr "Client-Geräte"
 
-#: plugins/personal/samba/samba3.tpl:172
+#: plugins/personal/samba/samba3.tpl:194
 msgid "Connect client drives at logon"
 msgstr "Client-Laufwerke beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:178
+#: plugins/personal/samba/samba3.tpl:200
 msgid "Connect client printers at logon"
 msgstr "Client-Drucker beim Anmelden verbinden"
 
-#: plugins/personal/samba/samba3.tpl:184
+#: plugins/personal/samba/samba3.tpl:206
 msgid "Default to main client printer"
 msgstr "Standard-Drucker vom Client wählen"
 
-#: plugins/personal/samba/samba3.tpl:194
-#: plugins/personal/connectivity/pureftpd.tpl:64
+#: plugins/personal/samba/samba3.tpl:216
+#: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/personal/samba/samba3.tpl:198
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Shadowing"
 msgstr "Spiegeln"
 
-#: plugins/personal/samba/samba3.tpl:207
+#: plugins/personal/samba/samba3.tpl:229
 msgid "On broken or timed out"
 msgstr "Bei Trennung oder abgelaufenem Zeitlimit"
 
-#: plugins/personal/samba/samba3.tpl:215
+#: plugins/personal/samba/samba3.tpl:237
 msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
-#: plugins/personal/samba/samba3.tpl:242
+#: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: plugins/personal/samba/samba3.tpl:257
+#: plugins/personal/samba/samba3.tpl:279
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
-#: plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba3.tpl:291
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
-#: plugins/personal/samba/samba3.tpl:281
+#: plugins/personal/samba/samba3.tpl:304
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
-#: plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/samba3.tpl:324
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
@@ -1769,12 +1839,12 @@ msgstr "von jedem Client"
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:636
+#: plugins/personal/samba/class_sambaAccount.inc:643
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1782,7 +1852,7 @@ msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/class_sambaAccount.inc:659
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1790,7 +1860,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:836
+#: plugins/personal/samba/class_sambaAccount.inc:843
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1798,7 +1868,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:867
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1829,7 +1899,7 @@ 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:95
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
 msgid "Please select a printer or press cancel."
 msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
 
@@ -1850,8 +1920,9 @@ 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/groups/group_objects.tpl:46
 #: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
@@ -1860,34 +1931,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:246
-#: plugins/personal/environment/class_environment.inc:282
+#: plugins/personal/environment/class_environment.inc:253
+#: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
 msgstr "Umgebungs-Erweiterung entfernen"
 
-#: plugins/personal/environment/class_environment.inc:247
-#: plugins/personal/environment/class_environment.inc:283
+#: plugins/personal/environment/class_environment.inc:254
+#: plugins/personal/environment/class_environment.inc:291
 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:256
-#: plugins/personal/environment/class_environment.inc:261
-#: plugins/personal/environment/class_environment.inc:289
-#: plugins/personal/environment/class_environment.inc:294
+#: plugins/personal/environment/class_environment.inc:263
+#: plugins/personal/environment/class_environment.inc:268
+#: plugins/personal/environment/class_environment.inc:296
+#: plugins/personal/environment/class_environment.inc:301
 msgid "Add environment extension"
 msgstr "Umgebungs-Erweiterung hinzufügen"
 
-#: plugins/personal/environment/class_environment.inc:257
-#: plugins/personal/environment/class_environment.inc:290
+#: plugins/personal/environment/class_environment.inc:264
+#: plugins/personal/environment/class_environment.inc:297
 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:262
-#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:269
+#: plugins/personal/environment/class_environment.inc:302
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -1896,18 +1967,27 @@ msgstr ""
 "diese zu aktivieren werden die UNIX-Erweiterungen benötigt. Diese müssen "
 "zuerst aktiviert werden."
 
-#: plugins/personal/environment/class_environment.inc:485
-#: plugins/personal/environment/class_environment.inc:487
+#: plugins/personal/environment/class_environment.inc:381
+msgid "auto"
+msgstr "auto"
+
+#: plugins/personal/environment/class_environment.inc:414
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "None"
+msgstr "keine"
+
+#: plugins/personal/environment/class_environment.inc:510
+#: plugins/personal/environment/class_environment.inc:521
 #: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:345
+#: plugins/admin/systems/class_workstationStartup.inc:501
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:716
+#: plugins/personal/environment/class_environment.inc:756
 msgid "Please set a valid profile quota size."
 msgstr "Bitte wählen Sie eine gültige Kontingent-Grösse."
 
-#: plugins/personal/environment/class_environment.inc:723
+#: plugins/personal/environment/class_environment.inc:763
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -1915,21 +1995,21 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:745
+#: plugins/personal/environment/class_environment.inc:801
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Das neue Kiosk-Profil kann nicht gespeichert werden. Wahrscheinlich besitzen "
 "Sie nicht die nötigen Rechte."
 
-#: plugins/personal/environment/class_environment.inc:838
+#: plugins/personal/environment/class_environment.inc:895
 msgid "Error while writing printer"
 msgstr "Fehler beim Speichern des Druckers"
 
-#: plugins/personal/environment/class_environment.inc:908
+#: plugins/personal/environment/class_environment.inc:966
 msgid "Error while writing printer settings"
 msgstr "Fehler beim Speichern der Drucker-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1030
+#: plugins/personal/environment/class_environment.inc:1080
 msgid "Admin"
 msgstr "Administrator"
 
@@ -1956,8 +2036,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:100
-#: plugins/personal/environment/environment.tpl:146
+#: plugins/personal/environment/environment.tpl:102
+#: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr "Umgebungs-Einstellungen"
 
@@ -1977,99 +2057,97 @@ msgstr "Profil-Server-Verwaltung"
 msgid "Profil path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/environment/environment.tpl:42
+#: plugins/personal/environment/environment.tpl:40
+msgid "Profil quota"
+msgstr "Profil-Kontingent"
+
+#: plugins/personal/environment/environment.tpl:54
 msgid "Cache profile localy"
 msgstr "Profil lokal zwischenspeichern"
 
-#: plugins/personal/environment/environment.tpl:51
+#: plugins/personal/environment/environment.tpl:63
 msgid "Kiosk profile settings"
 msgstr "Kiosk-Profil-Einstellungen"
 
-#: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/environment.tpl:66
 msgid "Kiosk profile"
 msgstr "Kiosk-Profil"
 
-#: plugins/personal/environment/environment.tpl:60
+#: plugins/personal/environment/environment.tpl:72
 msgid "Manage"
 msgstr "Verwalten"
 
-#: plugins/personal/environment/environment.tpl:65
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Kontingent"
-
-#: plugins/personal/environment/environment.tpl:79
+#: plugins/personal/environment/environment.tpl:81
 msgid "Resolution changeable on runtime"
 msgstr "Auflösung änderbar während Betrieb"
 
-#: plugins/personal/environment/environment.tpl:84
+#: plugins/personal/environment/environment.tpl:86
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/workstationStartup.tpl:82
+#: plugins/admin/systems/terminalStartup.tpl:62
 msgid "Shares"
 msgstr "Freigaben"
 
-#: plugins/personal/environment/environment.tpl:116
-#: plugins/admin/systems/workstationStartup.tpl:88
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Mount-Pfad"
-
-#: plugins/personal/environment/environment.tpl:118
-#: plugins/personal/environment/kioskManagement.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/admin/fai/faiPackage.tpl:75
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
-#: plugins/admin/groups/class_groupMail.inc:417
-#: plugins/admin/applications/class_applicationParameters.inc:97
-#: plugins/admin/systems/workstationStartup.tpl:90
-#: plugins/admin/systems/printer.tpl:47
-#: plugins/admin/systems/terminalStartup.tpl:81
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
+#: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
+#: plugins/admin/groups/class_groupMail.inc:537
+#: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/workstationStartup.tpl:97
+#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:77
+#: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:388
+#: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Entfernen"
 
-#: plugins/personal/environment/environment.tpl:124
+#: plugins/personal/environment/environment.tpl:127
 msgid "Logon scripts"
 msgstr "Anmelde-Skripte"
 
-#: plugins/personal/environment/environment.tpl:125
+#: plugins/personal/environment/environment.tpl:128
 #: 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:149
+#: plugins/personal/environment/environment.tpl:152
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:153
 msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
-#: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/groups/class_groupManagement.inc:355
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/personal/environment/environment.tpl:164
+#: plugins/admin/groups/class_groupManagement.inc:456
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Neu"
 
-#: plugins/personal/environment/environment.tpl:161
+#: plugins/personal/environment/environment.tpl:165
 msgid "Existing"
 msgstr "Vorhanden"
 
-#: plugins/personal/environment/environment.tpl:169
+#: plugins/personal/environment/environment.tpl:173
 msgid "Printer settings"
 msgstr "Drucker-Einstellungen"
 
-#: plugins/personal/environment/environment.tpl:179
+#: plugins/personal/environment/environment.tpl:183
 msgid "Admin Toggle"
 msgstr "Administrator an/aus"
 
@@ -2104,10 +2182,10 @@ msgstr "Skriptname"
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:24 plugins/admin/systems/server.tpl:24
-#: plugins/admin/systems/phone.tpl:24 plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
+#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
@@ -2137,42 +2215,45 @@ msgid "Logon script"
 msgstr "Anmelde-Skript"
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/personal/environment/kioskManagement.tpl:24
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:71
-#: plugins/admin/fai/faiPackageConfiguration.tpl:5
-#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:63
-#: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
 #: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/systems/servRepositorySetup.tpl:41
 msgid "Apply"
 msgstr "Anwenden"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:61
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 "Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Zugriff verweigert."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:64
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 "Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Datei existiert "
 "nicht."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 "In Ihrer gosa.conf wurde kein 'KIOSKPATH' definiert. Die Verwaltung von "
 "KIOSK-Profilen ist nicht möglich."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:94
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2205,12 +2286,24 @@ msgstr "Sichern"
 msgid "Kiosk profile management"
 msgstr "Verwaltung der Kiosk-Profile"
 
-#: plugins/personal/environment/kioskManagement.tpl:12
+#: plugins/personal/environment/kioskManagement.tpl:13
 #: plugins/addons/ldapmanager/contentimport.tpl:15
 #: plugins/addons/ldapmanager/contentcsv.tpl:14
 msgid "Browse"
 msgstr "Durchsuchen"
 
+#: plugins/personal/environment/kioskManagement.tpl:25
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/glpiManufacturer.tpl:13
+#: plugins/admin/systems/glpi_edit_cartridge_type.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
+#: include/class_MultiSelectWindow.inc:45
+msgid "Close"
+msgstr "Schliessen"
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr "Einstellungen der Benutzer-Umgebung"
@@ -2226,19 +2319,31 @@ 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:6
-#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Bild"
 
-#: 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:114
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servdnseditzone.tpl:121
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
 msgid "Save"
 msgstr "Sichern"
 
@@ -2246,227 +2351,259 @@ msgstr "Sichern"
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: 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/addons/addressbook/address_edit.tpl:22
-#: plugins/admin/users/template.tpl:23
+#: 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
 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/addons/addressbook/address_edit.tpl:22
-#: plugins/admin/users/template.tpl:19
+#: 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
 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:28
 msgid "Login"
 msgstr "Kennung"
 
-#: plugins/personal/generic/generic.tpl:49
+#: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_info.tpl:22
-#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:54
 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/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:127
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
 #: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:772
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/ogroups/generic.tpl:22 plugins/gofon/macro/generic.tpl:20
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 #: plugins/gofon/conference/generic.tpl:33
 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:128
-#: plugins/personal/generic/generic.tpl:272
+#: plugins/personal/generic/generic.tpl:134
+#: plugins/admin/groups/generic.tpl:26
+#: plugins/admin/departments/generic.tpl:33
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
+#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/wingeneric.tpl:18
+#: plugins/admin/ogroups/generic.tpl:26
+msgid "Select a base"
+msgstr "Wählen Sie eine Basis"
+
+#: plugins/personal/generic/generic.tpl:147
+#: plugins/personal/generic/generic.tpl:291
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_edit.tpl:93
-#: plugins/admin/departments/generic.tpl:54 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/generic.tpl:132
+#: plugins/personal/generic/generic.tpl:151
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/generic.tpl:136
+#: plugins/personal/generic/generic.tpl:155
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/generic.tpl:145
+#: plugins/personal/generic/generic.tpl:164
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:174
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:157
+#: plugins/personal/generic/generic.tpl:176
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:161
+#: plugins/personal/generic/generic.tpl:180
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:162
+#: plugins/personal/generic/generic.tpl:181
 msgid "Edit properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:197
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:190 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:209 html/getxls.php:236
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/generic.tpl:194
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/personal/generic/generic.tpl:213
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/addons/addressbook/address_edit.tpl:75
-#: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/admin/applications/class_applicationManagement.inc:357
-#: plugins/admin/systems/class_systemManagement.inc:589
-#: plugins/admin/ogroups/class_ogroupManagement.inc:417
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/generic.tpl:198
+#: plugins/personal/generic/generic.tpl:217
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/generic.tpl:223
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:210
+#: plugins/personal/generic/generic.tpl:229
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/generic.tpl:226
-#: plugins/personal/generic/generic.tpl:365
+#: plugins/personal/generic/generic.tpl:245
+#: plugins/personal/generic/generic.tpl:384
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:51 html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/generic.tpl:264
-#: plugins/admin/departments/generic.tpl:42
-#: plugins/admin/departments/generic.tpl:50
+#: plugins/personal/generic/generic.tpl:283
+#: plugins/admin/departments/generic.tpl:43
+#: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/generic.tpl:268
-#: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
+#: 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:286
+#: plugins/personal/generic/generic.tpl:305
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/generic.tpl:290
+#: plugins/personal/generic/generic.tpl:309
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/generic.tpl:298
+#: plugins/personal/generic/generic.tpl:317
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/generic.tpl:306
+#: plugins/personal/generic/generic.tpl:325
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/generic.tpl:332
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/generic.tpl:325
+#: plugins/personal/generic/generic.tpl:344
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/generic.tpl:333
+#: plugins/personal/generic/generic.tpl:352
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/generic.tpl:340
+#: plugins/personal/generic/generic.tpl:359
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/generic.tpl:346
+#: plugins/personal/generic/generic.tpl:365
 #: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:81 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/generic.tpl:352
+#: plugins/personal/generic/generic.tpl:371
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/generic.tpl:374
+#: plugins/personal/generic/generic.tpl:393
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/personal/generic/generic.tpl:406
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/generic.tpl:394
+#: plugins/personal/generic/generic.tpl:413
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
@@ -2486,96 +2623,92 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:256
 msgid "female"
 msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:256
 msgid "male"
 msgstr "männlich"
 
-#: plugins/personal/generic/class_user.inc:265
+#: plugins/personal/generic/class_user.inc:270
 msgid "This account has no valid GOsa extensions."
 msgstr "Dieses Konto besitzt keine gültigen GOsa-Erweiterungen."
 
-#: plugins/personal/generic/class_user.inc:294
+#: plugins/personal/generic/class_user.inc:324
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
 "abgebrochen."
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:420
 msgid "Please enter a valid serial number"
 msgstr "Bitte geben Sie eine gültige Seriennummer ein"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:457
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 "Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
 "s</b>)."
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:457
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:457
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:461
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:838
+#: plugins/personal/generic/class_user.inc:879
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:855
+#: plugins/personal/generic/class_user.inc:896
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:866
+#: plugins/personal/generic/class_user.inc:907
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "Invalid characters in uid."
-msgstr "Das Feld 'UID' enthält ungültige Zeichen."
-
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:947
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/personal/generic/class_user.inc:915
+#: plugins/personal/generic/class_user.inc:952
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:921
-#: plugins/addons/addressbook/class_addressbook.inc:542
-#: plugins/admin/users/class_userManagement.inc:547
+#: plugins/personal/generic/class_user.inc:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:930
+#: plugins/personal/generic/class_user.inc:967
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:550
+#: plugins/personal/generic/class_user.inc:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:939
+#: plugins/personal/generic/class_user.inc:976
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:946
+#: plugins/personal/generic/class_user.inc:983
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2583,7 +2716,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:990
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2591,50 +2724,49 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:956
+#: plugins/personal/generic/class_user.inc:993
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
 
-#: plugins/personal/generic/class_user.inc:959
-#: plugins/personal/generic/class_user.inc:987
-#: plugins/addons/addressbook/class_addressbook.inc:552
-#: plugins/addons/addressbook/class_addressbook.inc:580
-#: plugins/admin/departments/class_departmentGeneric.inc:169
+#: 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:211
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:962
-#: plugins/personal/generic/class_user.inc:984
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: 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
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:967
-#: plugins/personal/generic/class_user.inc:970
-#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/personal/generic/class_user.inc:1004
 #: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/admin/departments/class_departmentGeneric.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/personal/generic/class_user.inc:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:976
-#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:979
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1106
+#: plugins/personal/generic/class_user.inc:1140
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
@@ -2646,17 +2778,25 @@ msgstr "Sie haben keine Berechtigung, ihr Passwort zu 
 msgid "Generic user information"
 msgstr "Generische Benutzer-Information"
 
-#: plugins/personal/connectivity/proxy.tpl:16
+#: 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/connectivity/proxy.tpl:10
 msgid "Proxy account"
 msgstr "Proxy Konto"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:18
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 "Filtern von unerwünschten Inhalten (z.B. pornografische oder gewalttätige "
 "Inhalte)"
 
-#: plugins/personal/connectivity/proxy.tpl:35
+#: plugins/personal/connectivity/proxy.tpl:24
 msgid "Limit proxy access to working time"
 msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
@@ -2664,15 +2804,15 @@ msgstr "Inhaltsfilterung nur w
 msgid "Restrict proxy usage by quota"
 msgstr "Proxynutzung durch Kontingent einschränken"
 
-#: plugins/personal/connectivity/proxy.tpl:80
+#: plugins/personal/connectivity/proxy.tpl:86
 msgid "per"
 msgstr "pro"
 
-#: plugins/personal/connectivity/pptp.tpl:1
+#: plugins/personal/connectivity/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP-Konto"
 
-#: plugins/personal/connectivity/intranet.tpl:1
+#: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
@@ -2680,7 +2820,7 @@ msgstr "Intranet-Konto"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
+#: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
 
@@ -2713,6 +2853,7 @@ msgid "Free Busy information"
 msgstr "Frei/Belegt-Information"
 
 #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr "URL"
 
@@ -2730,49 +2871,57 @@ msgstr "Tage"
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
+#: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
 msgstr "FTP Konto"
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
+#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/admin/systems/glpi_devices.tpl:596
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/personal/connectivity/pureftpd.tpl:19
 msgid "Upload bandwidth"
 msgstr "Upload-Bandbreite"
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
 #: plugins/personal/connectivity/pureftpd.tpl:20
+#: plugins/personal/connectivity/pureftpd.tpl:24
 msgid "kb/s"
 msgstr "kb/s"
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
+#: plugins/personal/connectivity/pureftpd.tpl:23
 msgid "Download bandwidth"
 msgstr "Download-Bandbreite"
 
 #: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Quota"
+msgstr "Kontingent"
+
+#: plugins/personal/connectivity/pureftpd.tpl:39
 msgid "Files"
 msgstr "Dateien"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-#: plugins/addons/mailqueue/contents.tpl:56
+#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/addons/mailqueue/contents.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:293
+#: plugins/admin/systems/glpi_devices.tpl:420
+#: plugins/admin/systems/glpi_devices.tpl:485
 msgid "Size"
 msgstr "Größe"
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
+#: plugins/personal/connectivity/pureftpd.tpl:54
 msgid "Ratio"
 msgstr "Verhältnis"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:58
 msgid "Uploaded / downloaded files"
 msgstr "Hoch- / heruntergeladene Dateien"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Check to disable FTP Access"
 msgstr "Wählen Sie diese Option, um FTP-Zugriff zu deaktivieren"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Temporary disable FTP access"
 msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
@@ -2817,36 +2966,36 @@ msgstr "Zeitzone des Benutzers"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
-#: plugins/addons/mailqueue/class_mailqueue.inc:287
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:304
 msgid "hour"
 msgstr "Stunde"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "day"
 msgstr "Tag"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "week"
 msgstr "Woche"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "month"
 msgstr "Monat"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:133
+#: plugins/personal/connectivity/class_proxyAccount.inc:171
 msgid "Numerical value for Quota Setting is empty."
 msgstr "Das numerische Feld der Kontingent-Einstellung ist leer."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:136
+#: plugins/personal/connectivity/class_proxyAccount.inc:174
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
@@ -2863,7 +3012,7 @@ msgstr "Intranet"
 msgid "PHPGroupware"
 msgstr "phpGroupware"
 
-#: plugins/personal/connectivity/phpscheduleit.tpl:1
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr "PHPscheduleit-Konto"
 
@@ -2935,30 +3084,26 @@ msgstr ""
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
 msgid "Value specified as 'Files' is not valid."
 msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
 msgid "Value specified as 'Size' is not valid."
 msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_glpiAccount.inc:25
-msgid "GLPI"
-msgstr "GLPI"
-
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
@@ -2986,24 +3131,36 @@ 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:789
+#: 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:793
+#: 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:797
+#: 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/webdav.tpl:1
+#: 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/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "WebDAV-Konto"
 
@@ -3015,236 +3172,337 @@ msgstr "PHPscheduleit"
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "Opengroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Örtliches Team"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Benutzer-Vorlage"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr "Gesperrt"
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr "Teams"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
+msgid "Opengroupware account"
+msgstr "Opengroupware-Konto"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
+msgid ""
+"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
+"perform any database queries."
+msgstr ""
+"OpenGroupware: Keine postgresql-Erweiterung verfügbar. Kann keine "
+"Datenbankabfrage durchführen."
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:144
+msgid ""
+"OpenGroupware: Missing database configuration for opengroupware. Can't get "
+"or set any informations."
+msgstr "OpenGroupware: Datenbank-Konfiguration fehlt."
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:152
+msgid ""
+"OpenGroupware: Can't connect to specified database. Please check given "
+"configuration twice."
+msgstr "OpenGroupware: Die angegebene Datenbank kann nicht erreicht werden."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:206
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
 #, 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:220
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
 msgid "You have no permission to remove this blocklist."
 msgstr "Sie haben keine Berechtigung, diese Sperrliste zu entfernen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
 msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:670
-#: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:280
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:442
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+msgid "Go to root department"
+msgstr "Gehe zur Wurzel-Abteilung"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+msgid "Root"
+msgstr "Wurzel"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/groups/class_groupManagement.inc:452
+#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:670
-#: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:280
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/groups/class_groupManagement.inc:452
+#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Up"
 msgstr "Auf"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:671
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:281
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Go to root department"
-msgstr "Gehe zur Wurzel-Abteilung"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:671
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:281
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:361
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Root"
-msgstr "Wurzel"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/admin/applications/class_applicationManagement.inc:328
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
+#: plugins/admin/groups/class_groupManagement.inc:453
+#: plugins/admin/users/class_userManagement.inc:780
+#: plugins/admin/applications/class_applicationManagement.inc:474
+#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:445
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/groups/class_groupManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/admin/applications/class_applicationManagement.inc:328
-#: plugins/admin/departments/class_departmentManagement.inc:282
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
+#: plugins/admin/fai/class_faiManagement.inc:647
+#: plugins/admin/groups/class_groupManagement.inc:453
+#: plugins/admin/users/class_userManagement.inc:780
+#: plugins/admin/applications/class_applicationManagement.inc:474
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:446
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
 msgid "Home"
 msgstr "Heimat"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr "Liste neu laden"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr "Übertragen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "New Blocklist"
 msgstr "Neue Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:299
-#: plugins/admin/fai/class_faiManagement.inc:461
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:286
-#: plugins/admin/systems/class_systemManagement.inc:576
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:333
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-msgid "Current base"
-msgstr "Momentane Basis"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:287
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:287
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
-msgid "Submit"
-msgstr "Übertragen"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/fai/class_faiManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:681
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:294
-#: plugins/admin/systems/class_systemManagement.inc:582
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/fai/class_faiScript.inc:227
+#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
+#: plugins/admin/fai/class_faiHook.inc:251
+#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
+#: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/users/class_userManagement.inc:681
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/addons/mailqueue/contents.tpl:95
-#: plugins/admin/fai/class_faiManagement.inc:481
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:683
-#: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:295
-#: plugins/admin/systems/class_systemManagement.inc:583
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
+#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/admin/users/class_userManagement.inc:683
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 msgid "Blocklist name"
 msgstr "Name der Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:477
-#: plugins/admin/groups/class_groupManagement.inc:388
-#: plugins/admin/users/class_userManagement.inc:692
-#: plugins/admin/applications/class_applicationManagement.inc:358
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/ogroups/class_ogroupManagement.inc:394
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:318
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Aktionen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Diese Tabelle enthält Sperrlisten des ausgewählten Unterbaums."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
-#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
+#: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:537
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
@@ -3263,13 +3521,17 @@ 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/fai/class_faiPartitionTableEntry.inc:179
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr "Typ"
 
@@ -3291,17 +3553,19 @@ msgstr "Nummern k
 
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/groups/remove.tpl:2 plugins/admin/users/remove.tpl:2
-#: plugins/admin/applications/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: plugins/gofon/conference/remove.tpl:2 html/index.php:227
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:237 html/index.php:243 html/index.php:301
 #: 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"
 
 #: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -3310,7 +3574,8 @@ msgstr ""
 "Daten wiederherzustellen."
 
 #: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
 #: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
 #: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
@@ -3460,7 +3725,7 @@ msgstr "Fax-Einstellungen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
 #: plugins/addons/addressbook/address_info.tpl:88
-#: plugins/addons/addressbook/address_edit.tpl:99
+#: plugins/addons/addressbook/address_edit.tpl:206
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Fax"
@@ -3490,8 +3755,8 @@ msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
-"Aktuell besitztt dieses Konto keine aktivierten Fax-Erweiterungen. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+"Aktuell besitzt dieses Konto keine aktivierten Fax-Erweiterungen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:218
 msgid "You're trying to add an invalid phone number."
@@ -3500,30 +3765,29 @@ msgstr "Sie versuchen, eine ung
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:365
-#: plugins/admin/groups/class_groupApplication.inc:416
+#: plugins/admin/groups/class_groupApplication.inc:515
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
 msgid "back"
 msgstr "zurück"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr "Das benötigte Feld 'Fax' ist nicht gesetzt."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:641
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Bitte geben Sie eine gültige Telefonnummer im Feld 'Fax' an."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:649
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "The mail address you've entered is invalid."
 msgstr "Die Mail Adresse, die Sie eingegeben haben, ist ungültig."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:657
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3531,155 +3795,168 @@ msgstr ""
 "'Fax an Drucker weiterleiten' ist nur möglich, wenn ein gültiger Drucker "
 "angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
 
-#: plugins/gofax/reports/detail.tpl:6
+#: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr "Fax Vorschau - bitte warten"
 
-#: plugins/gofax/reports/detail.tpl:9
+#: plugins/gofax/faxreports/detail.tpl:8
 msgid "Click on fax to download"
 msgstr "Klicken Sie auf das Fax, um es herunterzuladen"
 
-#: plugins/gofax/reports/detail.tpl:18
+#: plugins/gofax/faxreports/detail.tpl:17
 msgid "FAX ID"
 msgstr "Fax-ID"
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:21
+#: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/admin/systems/class_printGeneric.inc:677
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/gofax/reports/detail.tpl:26
+#: plugins/gofax/faxreports/detail.tpl:25
 msgid "Date / Time"
 msgstr "Datum / Zeit"
 
-#: plugins/gofax/reports/detail.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:29
 msgid "Sender MSN"
 msgstr "Absender-MSN"
 
-#: plugins/gofax/reports/detail.tpl:34
+#: plugins/gofax/faxreports/detail.tpl:33
 msgid "Sender ID"
 msgstr "Absender-ID"
 
-#: plugins/gofax/reports/detail.tpl:38
+#: plugins/gofax/faxreports/detail.tpl:37
 msgid "Receiver MSN"
 msgstr "Empfänger-MSN"
 
-#: plugins/gofax/reports/detail.tpl:42
+#: plugins/gofax/faxreports/detail.tpl:41
 msgid "Receiver ID"
 msgstr "Empfänger-ID"
 
-#: plugins/gofax/reports/detail.tpl:50
+#: plugins/gofax/faxreports/detail.tpl:49
 msgid "Status message"
 msgstr "Status-Nachricht"
 
-#: plugins/gofax/reports/detail.tpl:54
+#: plugins/gofax/faxreports/detail.tpl:53
 msgid "Transfer time"
 msgstr "Übertragungszeit"
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+#: plugins/gofax/faxreports/detail.tpl:57
+#: plugins/gofax/faxreports/contents.tpl:35
 msgid "# pages"
 msgstr "# Seiten"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
+#: plugins/gofax/faxreports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
-#: plugins/gofax/reports/class_faxreport.inc:106
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
-"Setup."
-
-#: plugins/gofax/reports/class_faxreport.inc:112
-#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
 "angezeigt werden!"
 
-#: plugins/gofax/reports/class_faxreport.inc:116
-#: plugins/gofax/reports/class_faxreport.inc:228
-msgid "Can't select fax database for report generation!"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
 msgstr ""
-"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
-"werden!"
+"Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
+"Setup."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr "Kann die Fax-Datenbank zur Berichterstellung nicht öffnen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:124
-#: plugins/gofax/reports/class_faxreport.inc:236
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:132
+#: plugins/gofax/faxreports/class_faxreport.inc:185
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
 
-#: plugins/gofax/reports/class_faxreport.inc:152
-#: plugins/gofax/reports/class_faxreport.inc:244
-#: plugins/gofon/reports/class_fonreport.inc:175
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
+#: plugins/gofax/faxreports/contents.tpl:2
+#: plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/fonreports/contents.tpl:2
 msgid "Filter"
 msgstr "Filter"
 
-#: plugins/gofax/reports/contents.tpl:6
+#: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:12
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Suche nach"
 
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+#: plugins/gofax/faxreports/contents.tpl:7
+#: plugins/gofon/fonreports/contents.tpl:7
 msgid "Enter user name to search for"
 msgstr "Benutzername, nach dem gesucht werden soll"
 
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+#: plugins/gofax/faxreports/contents.tpl:8
+#: plugins/gofax/faxreports/contents.tpl:16
+#: plugins/gofon/fonreports/contents.tpl:8
+#: plugins/gofon/fonreports/contents.tpl:16
 msgid "in"
 msgstr "in"
 
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+#: plugins/gofax/faxreports/contents.tpl:9
+#: plugins/gofon/fonreports/contents.tpl:9
 msgid "Select subtree to base search on"
 msgstr "Wählen Sie den Teilbaum, in dem gesucht werden soll"
 
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+#: plugins/gofax/faxreports/contents.tpl:12
+#: plugins/gofon/fonreports/contents.tpl:12
 msgid "during"
 msgstr "während"
 
-#: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/mailqueue/contents.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:27
+#: plugins/gofax/faxreports/contents.tpl:21
+#: plugins/addons/mailqueue/contents.tpl:10
+#: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Suchen"
 
-#: plugins/gofax/reports/contents.tpl:31
+#: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
+#: plugins/gofon/fonreports/contents.tpl:30
 msgid "Date"
 msgstr "Datum"
 
-#: plugins/gofax/reports/contents.tpl:33
-#: plugins/addons/mailqueue/contents.tpl:58
+#: plugins/gofax/faxreports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:56
 msgid "Sender"
 msgstr "Absender"
 
-#: plugins/gofax/reports/contents.tpl:34
+#: plugins/gofax/faxreports/contents.tpl:34
 msgid "Receiver"
 msgstr "Empfänger"
 
-#: plugins/gofax/reports/contents.tpl:47
+#: plugins/gofax/faxreports/contents.tpl:50
 #: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
+#: plugins/gofon/fonreports/contents.tpl:51
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
-#: plugins/gofax/reports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:5
 msgid "FAX reports"
 msgstr "Fax-Berichte"
 
@@ -3688,15 +3965,15 @@ msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:364
+#: 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:375
-#: plugins/addons/addressbook/class_addressbook.inc:459
+#: plugins/addons/addressbook/class_addressbook.inc:453
 msgid "Dial"
 msgstr "Wähle"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:519
+#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
@@ -3705,14 +3982,31 @@ msgstr "W
 #: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/systems/servnfs.tpl:9 plugins/gofon/macro/parameter.tpl:5
-#: html/getxls.php:174 html/getxls.php:233
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Name"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:40
+#: plugins/addons/addressbook/address_edit.tpl:66
 msgid "Private"
 msgstr "Privat"
 
@@ -3735,6 +4029,7 @@ msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
 #: plugins/addons/addressbook/contents.tpl:50
+#: plugins/admin/groups/class_groupApplication.inc:597
 msgid "Edit entry"
 msgstr "Eintrag bearbeiten"
 
@@ -3792,12 +4087,12 @@ msgstr "Adressbuch"
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:154
+#: plugins/addons/addressbook/class_addressbook.inc:153
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:158
+#: plugins/addons/addressbook/class_addressbook.inc:157
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -3805,82 +4100,82 @@ msgstr ""
 "Sie haben keine Telefonnummer. Um direkt wählen zu können müssen Sie zuerst "
 "eine erstellen."
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:291
+#: plugins/addons/addressbook/class_addressbook.inc:186
+#: plugins/addons/addressbook/class_addressbook.inc:287
 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:285
+#: plugins/addons/addressbook/class_addressbook.inc:281
 #, 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:381
+#: plugins/addons/addressbook/class_addressbook.inc:377
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:385
+#: plugins/addons/addressbook/class_addressbook.inc:381
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:471
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: plugins/addons/addressbook/class_addressbook.inc:478
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:480
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:519
-#: plugins/addons/mailqueue/class_mailqueue.inc:269
-#: plugins/addons/mailqueue/class_mailqueue.inc:334
-#: plugins/addons/logview/class_logview.inc:68
-#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/mailqueue/class_mailqueue.inc:286
+#: plugins/addons/mailqueue/class_mailqueue.inc:351
+#: plugins/addons/logview/class_logview.inc:94
+#: plugins/addons/logview/class_logview.inc:111
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:519 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:513 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:520
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:520
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:174
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521 html/getxls.php:80
+#: plugins/addons/addressbook/class_addressbook.inc:515 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:593
+#: plugins/addons/addressbook/class_addressbook.inc:596
 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:605
+#: plugins/addons/addressbook/class_addressbook.inc:604
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3888,39 +4183,40 @@ msgstr ""
 "anzulegen."
 
 #: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_edit.tpl:24
 msgid "Personal"
 msgstr "Persönlich"
 
 #: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:29 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Initials"
 msgstr "Initialien"
 
 #: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr "Email"
 
 #: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_edit.tpl:119
 msgid "Organizational"
 msgstr "Organisationsbezogen"
 
 #: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:128
 msgid "Company"
 msgstr "Firma"
 
 #: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:78 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
 #: html/getxls.php:236
 msgid "City"
 msgstr "Stadt"
 
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_edit.tpl:168
 msgid "Country"
 msgstr "Land"
 
@@ -3933,158 +4229,159 @@ msgstr "W
 msgid "Mail queue"
 msgstr "Mail-Warteschlange"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:51
+#: 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:81
-#: plugins/addons/mailqueue/class_mailqueue.inc:105
-#: plugins/addons/mailqueue/class_mailqueue.inc:159
-#: plugins/addons/mailqueue/class_mailqueue.inc:186
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:176
+#: plugins/addons/mailqueue/class_mailqueue.inc:203
 #, 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:239
+#: plugins/addons/mailqueue/class_mailqueue.inc:256
 msgid "up"
 msgstr "auf"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:241
+#: plugins/addons/mailqueue/class_mailqueue.inc:258
 msgid "down"
 msgstr "ab"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:284
+#: plugins/addons/mailqueue/class_mailqueue.inc:301
 msgid "no limit"
 msgstr "keine Beschränkung"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:289
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
 msgid "hours"
 msgstr "Stunden"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:335
+#: plugins/addons/mailqueue/class_mailqueue.inc:352
 msgid "Hold"
 msgstr "Vorhalten"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:336
+#: plugins/addons/mailqueue/class_mailqueue.inc:353
 msgid "Un hold"
 msgstr "Vorhalten aufheben"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:337
-#: plugins/addons/mailqueue/contents.tpl:78
+#: plugins/addons/mailqueue/class_mailqueue.inc:354
+#: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr "Aktiv"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:338
+#: plugins/addons/mailqueue/class_mailqueue.inc:355
 msgid "Not active"
 msgstr "inaktiv"
 
-#: plugins/addons/mailqueue/contents.tpl:13
+#: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr "Bitte geben Sie einen Such-String ein."
 
-#: plugins/addons/mailqueue/contents.tpl:15
+#: plugins/addons/mailqueue/contents.tpl:14
 msgid "Select a server"
 msgstr "Wählen Sie einen Server"
 
-#: plugins/addons/mailqueue/contents.tpl:18
+#: plugins/addons/mailqueue/contents.tpl:17
 msgid "with status"
 msgstr "mit Status"
 
-#: plugins/addons/mailqueue/contents.tpl:22
+#: plugins/addons/mailqueue/contents.tpl:21
 msgid "within the last"
 msgstr "innerhalb der letzten"
 
-#: plugins/addons/mailqueue/contents.tpl:30
+#: plugins/addons/mailqueue/contents.tpl:29
 msgid "Remove all messages"
 msgstr "Entferne alle Nachrichten"
 
-#: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/contents.tpl:30
 msgid "Remove all messages from selected servers queue"
 msgstr "Entferne alle Nachrichten aus der Warteschlange des gewählten Servers"
 
-#: plugins/addons/mailqueue/contents.tpl:32
+#: plugins/addons/mailqueue/contents.tpl:31
 msgid "Hold all messages"
 msgstr "Alle Nachrichten vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:32
 msgid "Hold all messages in selected servers queue"
 msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:34
+#: plugins/addons/mailqueue/contents.tpl:33
 msgid "Release all messages"
 msgstr "Alle Nachrichten freigeben"
 
-#: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/contents.tpl:34
 msgid "Release all messages in selected servers queue"
 msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers freigeben"
 
-#: plugins/addons/mailqueue/contents.tpl:36
+#: plugins/addons/mailqueue/contents.tpl:35
 msgid "Requeue all messages"
 msgstr "Alle Nachrichten wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:37
+#: plugins/addons/mailqueue/contents.tpl:36
 msgid "Requeue all messages in selected servers queue"
 msgstr ""
 "Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:48
+#: plugins/addons/mailqueue/contents.tpl:46
 msgid "Search returned no results"
 msgstr "Die Suche verlief ergebnislos..."
 
-#: plugins/addons/mailqueue/contents.tpl:54
+#: plugins/addons/mailqueue/contents.tpl:52
 msgid "ID"
 msgstr "ID"
 
-#: plugins/addons/mailqueue/contents.tpl:57
+#: plugins/addons/mailqueue/contents.tpl:55
 msgid "Arrival"
 msgstr "Ankunft"
 
-#: plugins/addons/mailqueue/contents.tpl:59
+#: plugins/addons/mailqueue/contents.tpl:57
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: plugins/addons/mailqueue/contents.tpl:60
+#: plugins/addons/mailqueue/contents.tpl:58
 msgid "Error"
 msgstr "Fehler"
 
-#: plugins/addons/mailqueue/contents.tpl:95
+#: plugins/addons/mailqueue/contents.tpl:93
 msgid "Delete this message"
 msgstr "Diese Nachricht entfernen"
 
-#: plugins/addons/mailqueue/contents.tpl:99
+#: plugins/addons/mailqueue/contents.tpl:97
 msgid "unhold"
 msgstr "Vorhalten aufheben"
 
-#: plugins/addons/mailqueue/contents.tpl:99
+#: plugins/addons/mailqueue/contents.tpl:97
 msgid "Release message"
 msgstr "Nachricht freigeben"
 
-#: plugins/addons/mailqueue/contents.tpl:103
+#: plugins/addons/mailqueue/contents.tpl:101
 msgid "hold"
 msgstr "vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:103
+#: plugins/addons/mailqueue/contents.tpl:101
 msgid "Hold message"
 msgstr "Nachricht vorhalten"
 
-#: plugins/addons/mailqueue/contents.tpl:107
+#: plugins/addons/mailqueue/contents.tpl:105
 msgid "requeue"
 msgstr "wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:107
+#: plugins/addons/mailqueue/contents.tpl:105
 msgid "Requeue this message"
 msgstr "Diese Nachricht wieder einreihen"
 
-#: plugins/addons/mailqueue/contents.tpl:110
+#: plugins/addons/mailqueue/contents.tpl:108
 msgid "header"
 msgstr "Kopfzeilen"
 
-#: plugins/addons/mailqueue/contents.tpl:110
+#: plugins/addons/mailqueue/contents.tpl:108
 msgid "Display header from this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
 
@@ -4142,51 +4439,51 @@ msgstr "Hier klicken, um die exportierten Daten in eine xls-Datei zu speichern"
 msgid "LDIF export"
 msgstr "LDIF exportieren"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:96
+#: plugins/addons/ldapmanager/class_csvimport.inc:101
 msgid "You've no permission to do CSV imports."
 msgstr "Sie haben keine Berechtigung, um CSV Daten zu importieren."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:157
+#: plugins/addons/ldapmanager/class_csvimport.inc:161
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "Benötige 'Name', 'Vorname' und 'Kennung'' um den Benutzer anzulegen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:203
+#: plugins/addons/ldapmanager/class_csvimport.inc:209
 msgid "failed"
 msgstr "Fehlgeschlagen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:207
+#: plugins/addons/ldapmanager/class_csvimport.inc:213
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:264
+#: plugins/addons/ldapmanager/class_csvimport.inc:277
 msgid "status"
 msgstr "Status"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:268
+#: plugins/addons/ldapmanager/class_csvimport.inc:281
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Ein Fehler trat während des Einfügens des Eintrags %s auf - Vorgang "
 "abgebrochen"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:293
+#: plugins/addons/ldapmanager/class_csvimport.inc:319
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:305
-#: plugins/addons/ldapmanager/class_csvimport.inc:316
-#: plugins/addons/ldapmanager/class_csvimport.inc:321
+#: plugins/addons/ldapmanager/class_csvimport.inc:331
+#: plugins/addons/ldapmanager/class_csvimport.inc:342
+#: plugins/addons/ldapmanager/class_csvimport.inc:347
 #: plugins/addons/ldapmanager/class_import.inc:62
 #: plugins/addons/ldapmanager/class_import.inc:70
 msgid "There is no file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
+#: plugins/addons/ldapmanager/class_csvimport.inc:336
 #: plugins/addons/ldapmanager/class_import.inc:55
 msgid "The specified file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:449
+#: plugins/addons/ldapmanager/class_csvimport.inc:490
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Die gewählte Datei enthält keine CSV Daten..."
 
@@ -4249,9 +4546,9 @@ msgstr "Es gab einen Fehler w
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:39
 msgid "Here is the status report for the import:"
-msgstr "Hier ist der Statusreport vom Import:"
+msgstr "Statusreport des Imports:"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
+#: plugins/addons/ldapmanager/contentcsv.tpl:80
 msgid "Selected Template"
 msgstr "Gewählte Vorlage"
 
@@ -4259,13 +4556,13 @@ msgstr "Gew
 msgid "XLS import"
 msgstr "XLS-Import"
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:39
 #: plugins/addons/ldapmanager/class_export.inc:38
 msgid "You've no permission to do LDAP exports."
 msgstr ""
 "Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:88
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
 #: plugins/addons/ldapmanager/class_export.inc:83
 msgid "Error while exporting the requested entries!"
 msgstr "Fehler beim Export der angeforderten Einträge!"
@@ -4307,7 +4604,7 @@ msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
 msgid "LDAP manager"
 msgstr "LDAP-Manager"
 
-#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "CSV-Import"
 
@@ -4315,69 +4612,61 @@ msgstr "CSV-Import"
 msgid "System logs"
 msgstr "Systemprotokolle"
 
-#: plugins/addons/logview/class_logview.inc:37
+#: plugins/addons/logview/class_logview.inc:63
 msgid "No LOG servers defined!"
 msgstr "Keine LOG-Server definiert!"
 
-#: plugins/addons/logview/class_logview.inc:53
-#: plugins/addons/logview/class_logview.inc:157
+#: plugins/addons/logview/class_logview.inc:73
+#: plugins/addons/logview/class_logview.inc:168
+msgid "Can't connect to log database, no logs can be shown!"
+msgstr ""
+"Die LOG-Datenbank kann nicht erreicht werden. Es können keine Protokolle "
+"angezeigt werden!"
+
+#: plugins/addons/logview/class_logview.inc:77
+#: plugins/addons/logview/class_logview.inc:171
 msgid "Can't select log database for log generation!"
 msgstr ""
 "Die LOG-Datenbank kann bezüglich der Protokollgenerierung nicht ausgewählt "
 "werden!"
 
-#: plugins/addons/logview/class_logview.inc:62
-#: plugins/addons/logview/class_logview.inc:76
-#: plugins/addons/logview/class_logview.inc:229
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:103
 msgid "Query for log database failed!"
 msgstr "Die Anfrage zur LOG-Datenbank ist fehlgeschlagen!"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:118
 msgid "one hour"
 msgstr "eine Stunde"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:118
 msgid "6 hours"
 msgstr "6 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:119
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:119
 msgid "24 hours"
 msgstr "24 Stunden"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:120
 msgid "2 days"
 msgstr "2 Tage"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:120
 msgid "one week"
 msgstr "eine Woche"
 
-#: plugins/addons/logview/class_logview.inc:89
+#: plugins/addons/logview/class_logview.inc:121
 msgid "2 weeks"
 msgstr "2 Wochen"
 
-#: plugins/addons/logview/class_logview.inc:89
+#: plugins/addons/logview/class_logview.inc:121
 msgid "one month"
 msgstr "ein Monat"
 
-#: plugins/addons/logview/class_logview.inc:107
-msgid ""
-"There is no mysql extension available in your php setup, can't perform any "
-"query."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Abfrage "
-"ausführen."
-
-#: plugins/addons/logview/class_logview.inc:154
-msgid "Can't connect to log database, no logs can be shown!"
-msgstr ""
-"Die LOG-Datenbank kann nicht erreicht werden. Es können keine Protokolle "
-"angezeigt werden!"
-
 #: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
 msgstr "Zeige Rechner"
@@ -4414,11 +4703,18 @@ msgstr "Nachricht"
 msgid "System log view"
 msgstr "Systemprotokolle"
 
-#: plugins/admin/fai/tabsHook.inc:30 plugins/admin/fai/tabsPartition.inc:33
-#: plugins/admin/fai/tabsVariable.inc:30 plugins/admin/fai/tabsPackage.inc:30
-#: plugins/admin/fai/tabsProfile.inc:30 plugins/admin/fai/tabsScript.inc:30
-#: plugins/admin/fai/tabsTemplate.inc:30
-#: plugins/admin/departments/tabs_department.inc:30
+#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+msgid "Download"
+msgstr "Herunterladen"
+
+#: 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
+#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/tabs_department.inc:31
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 "Verschieben des Baums ist fehlgeschlagen: Der Zielbaum ist ein Unterbaum des "
@@ -4432,21 +4728,46 @@ msgstr "FAI"
 msgid "Fully Automatic Installation - management"
 msgstr "Verwaltung von FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:205
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:211
-#: plugins/admin/fai/class_faiManagement.inc:250
-#: plugins/admin/systems/class_systemManagement.inc:413
-#: plugins/admin/systems/class_systemManagement.inc:477
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
+#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:603
 msgid "You are not allowed to delete this component!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
-#: plugins/admin/fai/class_faiManagement.inc:396
-#: plugins/admin/fai/faiPackageNew.tpl:65 plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:323
+#, 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:326
+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:382
+msgid "Specified branch name is invalid."
+msgstr "Der angegebene Zweigname ist ungültig."
+
+#: plugins/admin/fai/class_faiManagement.inc:384
+msgid "Specified freeze name is invalid."
+msgstr "Der angegebene \"Freeze\"-Name ist ungültig."
+
+#: plugins/admin/fai/class_faiManagement.inc:391
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#: plugins/admin/systems/class_servRepository.inc:208
+msgid "This name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
+#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4458,113 +4779,117 @@ msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu l
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:647
+#: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "New scripts"
 msgstr "Neue Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "New hooks"
 msgstr "Neue Hooks"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "New variables"
 msgstr "Neue Variablen"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "New templates"
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:471
-#: plugins/admin/systems/class_systemManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 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:475
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr "Name der FAI-Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:476
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr "Typ der Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:480
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_faiManagement.inc:481
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/fai/class_faiManagement.inc:501
-#: plugins/admin/groups/class_groupApplication.inc:371
-#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/fai/class_faiManagement.inc:718
+#: plugins/admin/groups/class_groupApplication.inc:521
+#: plugins/admin/departments/class_departmentManagement.inc:335
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/fai/class_faiManagement.inc:523
-#: plugins/admin/fai/class_faiManagement.inc:524
-#: plugins/admin/fai/class_faiProfile.inc:161
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
+#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:530
-#: plugins/admin/fai/class_faiManagement.inc:531
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr "Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:537
-#: plugins/admin/fai/class_faiManagement.inc:538
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:558
-#: plugins/admin/fai/class_faiManagement.inc:559
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 msgid "Profile"
 msgstr "Profil"
 
@@ -4577,6 +4902,15 @@ msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr "Diese Liste zeigt alle diesem Repository zugeordneten Paket-Namen."
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+"Die Suche nach '%s' ergab zu viele Treffer. Es werden nur die ersten 200 "
+"Einträge angezeigt, um den Speicherverbrauch gering zu halten."
+
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
@@ -4584,7 +4918,7 @@ msgstr "Automatische Installation"
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
 #: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
 #: plugins/admin/fai/faiHook.tpl:32
 msgid "Objects"
 msgstr "Objekte"
@@ -4601,7 +4935,7 @@ msgstr "W
 msgid "List of FAI objects (Fully Automatic Installation)"
 msgstr "Liste von FAI-Objekten"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:27
+#: plugins/admin/fai/faiProfileEntry.tpl:26
 msgid ""
 "This menu allows you to select FAI class names and to add them to the "
 "currently edited profile."
@@ -4609,41 +4943,43 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, FAI Klassen-Namen auszuwählen und zum "
 "gegenwärtig bearbeiteten Profil hinzuzufügen."
 
-#: plugins/admin/fai/faiProfileEntry.tpl:40
+#: plugins/admin/fai/faiProfileEntry.tpl:39
 msgid "Show only classes with templates"
 msgstr "Zeige nur Klassen mit Vorlagen"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:42
+#: plugins/admin/fai/faiProfileEntry.tpl:41
 msgid "Show only classes with scripts"
 msgstr "Zeige nur Klassen mit Skripten"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:44
+#: plugins/admin/fai/faiProfileEntry.tpl:43
 msgid "Show only classes with hooks"
 msgstr "Zeige nur Klassen mit Hooks"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:46
+#: plugins/admin/fai/faiProfileEntry.tpl:45
 msgid "Show only classes with variables"
 msgstr "Zeige nur Klassen mit Variablen"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:48
+#: plugins/admin/fai/faiProfileEntry.tpl:47
 msgid "Show only classes with packages"
 msgstr "Zeige nur Klassen mit Paketen"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:50
+#: plugins/admin/fai/faiProfileEntry.tpl:49
 msgid "Show only classes with partitions"
 msgstr "Zeige nur Klassen mit Partitionen"
 
+#: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiProfileEntry.tpl:56
-#: plugins/admin/fai/faiPackageEntry.tpl:48 plugins/admin/fai/headpage.tpl:47
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:30
+#: plugins/admin/fai/faiPackageEntry.tpl:42 plugins/admin/fai/headpage.tpl:82
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
+#: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr "Zeige die Objekte, auf die Folgendes passt"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:60
-#: plugins/admin/fai/faiPackageEntry.tpl:53 plugins/admin/fai/headpage.tpl:51
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:34
+#: plugins/admin/fai/faiProfileEntry.tpl:59
+#: plugins/admin/fai/faiPackageEntry.tpl:46 plugins/admin/fai/headpage.tpl:86
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
+#: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Objekt-Namen"
@@ -4652,24 +4988,24 @@ msgstr "Regul
 msgid "Package"
 msgstr "Paket"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
+#: 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:54
-#: plugins/admin/fai/class_faiHookEntry.inc:57
+#: 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:99
-#: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:112
-#: plugins/admin/fai/class_faiTemplateEntry.inc:164
+#: plugins/admin/fai/class_faiScriptEntry.inc:132
+#: plugins/admin/fai/class_faiVariableEntry.inc:101
+#: plugins/admin/fai/class_faiHookEntry.inc:145
+#: plugins/admin/fai/class_faiTemplateEntry.inc:178
 msgid "Please enter a name."
 msgstr "Bitte geben Sie eine Namen ein."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:103
+#: plugins/admin/fai/class_faiScriptEntry.inc:136
 msgid "Please enter a script."
 msgstr "Bitte geben Sie einen Skript an."
 
@@ -4682,12 +5018,12 @@ msgid "Choose a variable to delete or edit"
 msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:691
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:393
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Eigenschaften"
@@ -4706,117 +5042,100 @@ msgstr "W
 msgid "Import script"
 msgstr "Skript importieren"
 
-#: plugins/admin/fai/class_faiPackage.inc:148
-msgid "There is no useable package list defined."
-msgstr "Es wurde keine gebrauchsfähige Paketliste definiert."
-
-#: plugins/admin/fai/class_faiPackage.inc:293
-#, php-format
-msgid "Can't read configuration folder '%s'."
-msgstr "Kann das Konfigurationsverzeichnis '%s' nicht lesen."
-
-#: plugins/admin/fai/class_faiPackage.inc:375
+#: plugins/admin/fai/class_faiPackage.inc:340
 msgid "Please select a least one Package."
 msgstr "Bitte wählen Sie mindestens ein Paket."
 
-#: plugins/admin/fai/class_faiPackage.inc:379
+#: plugins/admin/fai/class_faiPackage.inc:344
 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:400
+#: plugins/admin/fai/class_faiPackage.inc:365
 msgid "package is configured"
 msgstr "Paket ist konfiguriert"
 
-#: plugins/admin/fai/class_faiPackage.inc:424
+#: plugins/admin/fai/class_faiPackage.inc:389
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Paket '%s' existiert nicht."
 
-#: plugins/admin/fai/faiPackage.tpl:29
-msgid "Repository"
-msgstr "Repository"
-
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:29
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:35
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:248
 msgid "Release"
 msgstr "Release"
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:313
+#: plugins/admin/systems/class_printerPPDDialog.inc:319
 msgid "Section"
 msgstr "Section"
 
-#: plugins/admin/fai/faiPackage.tpl:50
-msgid "Mirror"
-msgstr "Mirror"
-
-#: plugins/admin/fai/faiPackage.tpl:54 plugins/admin/fai/faiPackageNew.tpl:51
-msgid "mirror"
-msgstr "Mirror"
-
-#: plugins/admin/fai/faiPackage.tpl:57 plugins/admin/fai/faiPackageNew.tpl:59
-#: plugins/admin/systems/workstationStartup.tpl:41
-msgid "set"
-msgstr "setzen"
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr "Installations-Methode"
 
-#: plugins/admin/fai/faiPackage.tpl:68
+#: plugins/admin/fai/faiPackage.tpl:65
 msgid "Used packages"
 msgstr "Verwendete Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:70
+#: plugins/admin/fai/faiPackage.tpl:67
 msgid "Choosen packages"
 msgstr "Gewählte Pakete"
 
-#: plugins/admin/fai/faiPackage.tpl:76 include/functions.inc:587
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:597
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plugins/admin/fai/class_faiProfile.inc:145
-#: plugins/admin/fai/class_faiProfileEntry.inc:151
+#: 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:153
-msgid "Append new class names"
-msgstr "Neue Klassen-Namen anfügen"
-
-#: plugins/admin/fai/class_faiProfile.inc:156
-#: plugins/admin/fai/class_faiProfileEntry.inc:118
+#: 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:157
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: 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:158
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: 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:159
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: 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:160
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Packages bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:163
+#: plugins/admin/fai/class_faiProfile.inc:300
 msgid "Remove class from profile"
 msgstr "Entferne Klasse von Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:226
+#: plugins/admin/fai/class_faiProfile.inc:304
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
+msgstr "Ab"
+
+#: plugins/admin/fai/class_faiProfile.inc:381
 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:230
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please enter a valid name."
 msgstr "Bitte geben Sie einen gültigen Namen ein."
 
-#: plugins/admin/fai/class_faiProfile.inc:238
+#: plugins/admin/fai/class_faiProfile.inc:393
 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."
@@ -4825,41 +5144,41 @@ msgstr ""
 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
 msgid "Mount point"
 msgstr "Mount-Punkt"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
 msgid "Size in MB"
 msgstr "Größe in MB"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
 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:355
 #, 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:360
 #, 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:365
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -4868,31 +5187,39 @@ 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:369
 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:375
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:379
 #, 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:385
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
 #, 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:392
 #, 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:407
+msgid ""
+"You have more than 3 primary partition table entries in your configuration, "
+"please check your configuration twice."
+msgstr ""
+"Sie haben mehr als 3 primäre Partitionen in ihrer Konfiguration. Bitte "
+"prüfen Sie die Konfiguration."
+
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 msgid "Device"
 msgstr "Gerät"
@@ -4909,15 +5236,15 @@ msgstr "Partition hinzuf
 msgid "List of scripts"
 msgstr "Liste der Skripte"
 
-#: plugins/admin/fai/faiScript.tpl:40
+#: 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/faiPackageNew.tpl:2
+#: plugins/admin/fai/faiPackageNew.tpl:1
 msgid "Repository settings"
 msgstr "Repository-Einstellungen"
 
-#: plugins/admin/fai/faiPackageNew.tpl:6
+#: plugins/admin/fai/faiPackageNew.tpl:3
 msgid ""
 "To add packages to your package list you have to setup the repository "
 "settings first."
@@ -4925,7 +5252,7 @@ msgstr ""
 "Um Pakete zu ihrer Paketliste hinzuzufügen, müssen Sie zunächst die "
 "Repository-Einstellungen anpassen."
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
+#: plugins/admin/fai/faiPackageNew.tpl:5
 msgid ""
 "Packages are usually stored on different servers called mirrors. These "
 "mirrors have different types of releases (for example woody/sarge/etch), "
@@ -4936,7 +5263,7 @@ msgstr ""
 "etch,...). Diese enthalten wiederum nach Sections (main, contrib, non-"
 "free,...) sortierte Pakete."
 
-#: plugins/admin/fai/faiPackageNew.tpl:11
+#: plugins/admin/fai/faiPackageNew.tpl:8
 msgid ""
 "Section and release can't be changed in future dialogs, but the mirror can "
 "be changed by editing the entry."
@@ -4944,26 +5271,27 @@ msgstr ""
 "Section und Release können in späteren Dialogen nicht mehr geändert werden, "
 "jedoch kann der Mirror bearbeitet werden."
 
-#: plugins/admin/fai/faiPackageNew.tpl:17
+#: plugins/admin/fai/faiPackageNew.tpl:14
 msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 "Bitte wählen Sie zunächst das gewünschte Release, dann die Section und "
 "abschliessend den Mirror."
 
-#: plugins/admin/fai/faiPackageNew.tpl:25
+#: plugins/admin/fai/faiPackageNew.tpl:21
 msgid "Following releases are available"
 msgstr "Die folgenden Releases sind verfügbar"
 
-#: plugins/admin/fai/faiPackageNew.tpl:37
+#: plugins/admin/fai/faiPackageNew.tpl:31
 msgid "Sections for this release"
 msgstr "Sections für dieses Release"
 
-#: plugins/admin/fai/faiPackageNew.tpl:48
-msgid "Matching mirrors"
-msgstr "Passende Mirrors"
+#: plugins/admin/fai/faiPackageNew.tpl:35
+#: plugins/admin/systems/workstationStartup.tpl:43
+msgid "set"
+msgstr "setzen"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:82
+#: plugins/admin/fai/class_faiVariableEntry.inc:97
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Bitte geben Sie einen Wert für das Attribute 'Inhalt' an."
 
@@ -4979,7 +5307,7 @@ msgstr "Variablen-Inhalt"
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
-#: plugins/admin/fai/faiTemplate.tpl:37
+#: plugins/admin/fai/faiTemplate.tpl:38
 msgid "Choose a template to delete or edit"
 msgstr "Wählen Sie eine Vorlage zum Entfernen oder Bearbeiten"
 
@@ -5024,55 +5352,77 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, FAI-Klassen zu erstellen, entfernen und zu "
 "bearbeiten."
 
-#: plugins/admin/fai/headpage.tpl:36
+#: plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:30
+msgid "Branches"
+msgstr "Zweige"
+
+#: plugins/admin/fai/headpage.tpl:35
+#: plugins/admin/applications/headpage.tpl:36
+msgid "Current release"
+msgstr "Momentanes Release"
+
+#: plugins/admin/fai/headpage.tpl:47
+msgid "Create new branch"
+msgstr "Neuen Teilbaum erstellen"
+
+#: plugins/admin/fai/headpage.tpl:51
+msgid "Create new locked branch"
+msgstr "Nicht veränderbaren Teilbaum erzeugen"
+
+#: plugins/admin/fai/headpage.tpl:56
+msgid "Delete current release"
+msgstr "Momentanes Release entfernen"
+
+#: plugins/admin/fai/headpage.tpl:71
 msgid "Show profiles"
 msgstr "Zeige Profile"
 
-#: plugins/admin/fai/headpage.tpl:37 plugins/admin/users/headpage.tpl:38
+#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
 msgid "Show templates"
 msgstr "Zeige Vorlagen"
 
-#: plugins/admin/fai/headpage.tpl:38
+#: plugins/admin/fai/headpage.tpl:73
 msgid "Show scripts"
 msgstr "Zeige Skripte"
 
-#: plugins/admin/fai/headpage.tpl:39
+#: plugins/admin/fai/headpage.tpl:74
 msgid "Show hooks"
 msgstr "Zeige Hooks"
 
-#: plugins/admin/fai/headpage.tpl:40
+#: plugins/admin/fai/headpage.tpl:75
 msgid "Show variables"
 msgstr "Zeige Variablen"
 
-#: plugins/admin/fai/headpage.tpl:41
+#: plugins/admin/fai/headpage.tpl:76
 msgid "Show packages"
 msgstr "Zeige Pakete"
 
-#: plugins/admin/fai/headpage.tpl:42
+#: plugins/admin/fai/headpage.tpl:77
 msgid "Show partitions"
 msgstr "Zeige Partitionen"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:226
-#: plugins/admin/fai/class_faiPartitionTable.inc:232
+#: plugins/admin/fai/class_faiPartitionTable.inc:263
+#: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, php-format
 msgid "%s partition"
 msgstr "%s Partition"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:228
-#: plugins/admin/fai/class_faiPartitionTable.inc:234
+#: plugins/admin/fai/class_faiPartitionTable.inc:265
+#: plugins/admin/fai/class_faiPartitionTable.inc:271
 #, php-format
 msgid "%s partition(s)"
 msgstr "%s Partition(en)"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:108
+#: plugins/admin/fai/class_faiHookEntry.inc:141
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfileEntry.inc:123
 msgid "Package bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:153
+#: plugins/admin/fai/class_faiProfileEntry.inc:154
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Klassen-Name"
@@ -5089,48 +5439,48 @@ msgstr "Aufgabe"
 msgid "Choose an existing FAI task"
 msgstr "Einen existierenden Task wählen"
 
-#: 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_askClassName.inc:71
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - partition table."
 msgstr "Erstelle neues FAI-Objekt - Partitions-Tabelle"
 
-#: plugins/admin/fai/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object - package bundle."
 msgstr "Erstelle neues FAI-Objekt - Paket-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:79
 msgid "Create new FAI object - script bundle."
 msgstr "Erstelle neues FAI-Objekt - Skript-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:80
 msgid "Create new FAI object - variable bundle."
 msgstr "Erstelle neues FAI-Objekt - Variablen-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - hook bundle."
 msgstr "Erstelle neues FAI-Objekt - Hook-Gruppe"
 
-#: plugins/admin/fai/class_askClassName.inc:76
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - profile."
 msgstr "Erstelle neues FAI-Objekt - Profil"
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object - template."
 msgstr "Erstelle neues FAI-Objekt - Vorlage"
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:84
 msgid "Create new FAI object"
 msgstr "Erstelle neues FAI-Objekt"
 
-#: plugins/admin/fai/class_askClassName.inc:131
+#: plugins/admin/fai/class_askClassName.inc:137
 msgid "The given class name is empty."
 msgstr "Der angebene Klassen-Name ist leer."
 
-#: plugins/admin/fai/class_askClassName.inc:135
+#: plugins/admin/fai/class_askClassName.inc:141
 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."
@@ -5171,6 +5521,13 @@ msgid "Choose class name"
 msgstr "Wählen Sie den Klassen-Namen"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:113
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
+#: plugins/admin/systems/glpiAttachmentPool.tpl:51
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
+#: plugins/admin/systems/SelectDeviceType.tpl:44
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 msgid "Use"
 msgstr "Benutzen"
 
@@ -5178,37 +5535,37 @@ msgstr "Benutzen"
 msgid "A new class name."
 msgstr "Ein neuer Klassen-Name."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:74
+#: plugins/admin/fai/class_faiTemplateEntry.inc:81
 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:83
 #, 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:170
 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:174
 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:182
 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:185
 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:189
 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:192
 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)."
 
@@ -5216,7 +5573,8 @@ msgstr "Bitte geben Sie eine g
 msgid "Template attributes"
 msgstr "Vorlagen-Attribute"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:122
+#: plugins/admin/fai/faiTemplateEntry.tpl:29
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:130
 msgid "File"
 msgstr "Datei"
 
@@ -5225,8 +5583,9 @@ msgid "Save template"
 msgstr "Vorlage speichern"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:92
+#: plugins/admin/applications/generic.tpl:96
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -5235,15 +5594,15 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:316
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr "Besitzer"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:582
-#: plugins/admin/systems/class_printGeneric.inc:584
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:672
+#: plugins/admin/systems/class_printGeneric.inc:674
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Gruppe"
@@ -5253,6 +5612,7 @@ msgid "Access"
 msgstr "Zugriff"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/systems/class_servDNS.inc:161
 msgid "Class"
 msgstr "Klasse"
 
@@ -5266,8 +5626,8 @@ msgstr "Schreiben"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
-#: plugins/admin/systems/workstation.tpl:88
+#: plugins/admin/systems/server.tpl:49 plugins/admin/systems/terminal.tpl:110
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
 msgstr "Ausführen"
@@ -5296,23 +5656,86 @@ msgstr "sticky"
 msgid "List of hook scripts"
 msgstr "Liste der Hook-Skripte"
 
-#: plugins/admin/fai/faiHook.tpl:40
+#: 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/groups/mail.tpl:11
-msgid "Primary mail address for this shared folder"
-msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
+#: 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 "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+"Sie sind dabei, einen neuen (evtl. gesperrten) Zweig zu erstellen. Diese "
+"Aktion klont das existierende Release auf einen anderen Releasenamen. Zweige "
+"können wie gewohnt bearbeitet werden. FAI-Klassen von gesperrten Zweigen "
+"können nicht bearbeitet werden, lediglich das Hinzufügen von Klassen ist "
+"möglich. Zweignamen sollten alphanumerisch sein, reservierte Namen sind "
+"'scripts', 'hooks', 'partitions', 'variables', 'templates' und 'fai'. Diese "
+"können nicht verwendet werden."
 
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
+#: 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/groups/mail.tpl:63
-msgid "IMAP shared folders"
-msgstr "IMAP Austausch-Ordner"
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+msgid "Processing the requested operation"
+msgstr "Gewünschte Operation wird durchgeführt"
 
-#: plugins/admin/groups/mail.tpl:67
+#: 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:40
+#: plugins/admin/departments/recursive_move.tpl:7
+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/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 "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Dies umfasst alle Kontodaten, Zugriffsregeln etc. für diesen Zweig. Bitte "
+"prüfen Sie genau, da es keine Möglichkeit gibt, diese Aktion rückgängig zu "
+"machen."
+
+#: 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"
+
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
+
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr "IMAP Austausch-Ordner"
+
+#: plugins/admin/groups/mail.tpl:67
 msgid "Default permission"
 msgstr "Standard-Berechtigungen"
 
@@ -5320,108 +5743,178 @@ 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"
 
 #: 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:276
+#: plugins/admin/groups/class_groupManagement.inc:357
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
 
-#: plugins/admin/groups/class_groupManagement.inc:282
-#: plugins/admin/groups/class_groupManagement.inc:308
+#: plugins/admin/groups/class_groupManagement.inc:363
+#: plugins/admin/groups/class_groupManagement.inc:389
 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:355
+#: plugins/admin/groups/class_groupManagement.inc:441
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/ogroups/class_ogroupManagement.inc:431
+msgid "Paste"
+msgstr "Einfügen"
+
+#: plugins/admin/groups/class_groupManagement.inc:443
+#: plugins/admin/users/class_userManagement.inc:769
+#: plugins/admin/applications/class_applicationManagement.inc:464
+#: plugins/admin/ogroups/class_ogroupManagement.inc:433
+msgid "Can't paste"
+msgstr "Kann nicht einfügen"
+
+#: plugins/admin/groups/class_groupManagement.inc:456
 msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:294
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "cut"
+msgstr "Ausschneiden"
+
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "Cut this entry"
+msgstr "Diesen Eintrag ausschneiden"
+
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "copy"
+msgstr "Kopieren"
+
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "Copy this entry"
+msgstr "Diesen Eintrag kopieren"
+
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:295
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
-#: plugins/gofon/reports/contents.tpl:34
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
+#: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/groups/class_groupManagement.inc:524
 msgid "Groupname"
 msgstr "Name der Gruppe"
 
-#: plugins/admin/groups/class_groupManagement.inc:391
-#: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/ogroups/class_ogroupManagement.inc:398
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 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:115
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Die SID dieser Gruppe kann weder im LDAP noch in der Konfigurationsdatei "
 "gefunden werden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:179
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:282
+#: plugins/admin/groups/class_groupGeneric.inc:330
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:287
+#: plugins/admin/groups/class_groupGeneric.inc:335
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:621
-#: plugins/admin/ogroups/class_ogroup.inc:526
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, 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:462
+msgid "! unknown id"
+msgstr "! unbekannte id"
+
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
+msgstr "Keine konfigurierte SID für %s gefunden"
+
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr "Keine konfigurierte RIDBASE für '%s' gefunden."
+
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -5429,8 +5922,9 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:642
-#: plugins/admin/groups/class_groupGeneric.inc:649
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
@@ -5460,60 +5954,107 @@ msgstr ""
 "entfernen. Bei einer großen Anzahl von Gruppen bietet sich die Verwendung "
 "der Bereichsauswahl an."
 
-#: plugins/admin/groups/class_groupMail.inc:158
+#: 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/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
+
+#: 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/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Zeige Samba-Gruppen"
+
+#: 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/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Zeige Anwendungs-Gruppen"
+
+#: plugins/admin/groups/headpage.tpl:54
+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/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Zeige E-Mail-Gruppen"
+
+#: 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/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Zeige Funktions-Gruppen"
+
+#: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
 msgstr "lesen"
 
-#: plugins/admin/groups/class_groupMail.inc:159
+#: plugins/admin/groups/class_groupMail.inc:279
 msgid "post"
 msgstr "posten"
 
-#: plugins/admin/groups/class_groupMail.inc:160
+#: plugins/admin/groups/class_groupMail.inc:280
 msgid "external post"
 msgstr "extern posten"
 
-#: plugins/admin/groups/class_groupMail.inc:161
+#: plugins/admin/groups/class_groupMail.inc:281
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:162
+#: plugins/admin/groups/class_groupMail.inc:282
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/groups/class_groupMail.inc:187
+#: 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:252
+#: 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:253
+#: 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:622
+#: plugins/admin/groups/class_groupMail.inc:807
 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:655
+#: plugins/admin/groups/class_groupMail.inc:840
 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:659
+#: plugins/admin/groups/class_groupMail.inc:844
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Objekt"
 
 #: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
 msgid "Choose"
 msgstr "Wählen"
 
@@ -5525,11 +6066,11 @@ msgstr "Anwenden dieser Zugriffsregel nur auf Eintr
 msgid "Used applications"
 msgstr "Verwendete Anwendungen"
 
-#: plugins/admin/groups/application.tpl:6
-msgid "Seperator"
-msgstr "Feldtrenner"
+#: plugins/admin/groups/application.tpl:7
+msgid "Add category"
+msgstr "Kategorie hinzufügen"
 
-#: plugins/admin/groups/application.tpl:11
+#: plugins/admin/groups/application.tpl:12
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
@@ -5537,28 +6078,41 @@ msgstr "Verf
 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/headpage.tpl:38
+#: 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/groups/group_objects.tpl:47
 #: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/systems/glpiSelectUser.tpl:37
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
 
-#: plugins/admin/groups/class_groupAcl.inc:58
+#: 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:203
+#: plugins/admin/groups/class_groupAcl.inc:207
 msgid "All fields are writeable"
 msgstr "Alle Felder sind änderbar"
 
-#: 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/class_ogroup.inc:736
+#: plugins/admin/ogroups/generic.tpl:7
 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"
 
@@ -5566,40 +6120,43 @@ msgstr "UNIX-Name der Gruppe"
 msgid "Descriptive text for this group"
 msgstr "Beschreibender Text für diese Gruppe"
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:24
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
 msgid "Choose subtree to place group in"
 msgstr "Wählen Sie den Unterbaum, in den die Gruppe eingepflegt werden soll"
 
-#: plugins/admin/groups/generic.tpl:36
+#: 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:36
+#: plugins/admin/groups/generic.tpl:37
+#: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Erzwinge GID"
 
-#: plugins/admin/groups/generic.tpl:38
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Erzwungene ID-Nummer"
 
-#: plugins/admin/groups/generic.tpl:45
+#: plugins/admin/groups/generic.tpl:46
 msgid "Select to create a samba conform group"
 msgstr "Auswählen, um eine sambakonforme Gruppe zu erzeugen"
 
-#: plugins/admin/groups/generic.tpl:50
+#: plugins/admin/groups/generic.tpl:51
 msgid "in domain"
 msgstr "in der Domain"
 
-#: plugins/admin/groups/generic.tpl:67
+#: plugins/admin/groups/generic.tpl:68
 msgid "Members are in a phone pickup group"
 msgstr "Mitglieder sind in einer Übernahme-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:80
+#: plugins/admin/groups/generic.tpl:81
 msgid "Members are in a nagios group"
 msgstr "Mitglieder sind in einer Nagios-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:96
+#: plugins/admin/groups/generic.tpl:97
 msgid "Group members"
 msgstr "Gruppenmitglieder"
 
@@ -5623,15 +6180,15 @@ msgstr "Zeige die Adressen der Abteilung"
 msgid "Display addresses matching"
 msgstr "Zeige die Adressen, auf die das Folgende passt"
 
-#: plugins/admin/groups/class_groupApplication.inc:202
+#: plugins/admin/groups/class_groupApplication.inc:295
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
 
-#: plugins/admin/groups/class_groupApplication.inc:210
+#: plugins/admin/groups/class_groupApplication.inc:303
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:211
+#: plugins/admin/groups/class_groupApplication.inc:304
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5639,11 +6196,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:213
+#: plugins/admin/groups/class_groupApplication.inc:306
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:214
+#: plugins/admin/groups/class_groupApplication.inc:307
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5651,39 +6208,50 @@ 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:242
+#: plugins/admin/groups/class_groupApplication.inc:319
+msgid "Invalid character in category name."
+msgstr "Die angegebene Kategorie enthält ungültige Zeichen."
+
+#: plugins/admin/groups/class_groupApplication.inc:327
+msgid "The specified category already exists."
+msgstr "Die angegebene Kategorie existiert bereits."
+
+#: plugins/admin/groups/class_groupApplication.inc:393
 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:278
+#: plugins/admin/groups/class_groupApplication.inc:429
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:529
 msgid "application"
 msgstr "Anwendung"
 
+#: plugins/admin/groups/class_groupApplication.inc:560
+#: plugins/admin/groups/class_groupApplication.inc:596
+msgid "Delete entry"
+msgstr "Eintrag entfernen"
+
+#: plugins/admin/groups/class_groupApplication.inc:564
+#: plugins/admin/groups/class_groupApplication.inc:594
+msgid "Move up"
+msgstr "Nach oben bewegen"
+
+#: plugins/admin/groups/class_groupApplication.inc:565
 #: plugins/admin/groups/class_groupApplication.inc:595
-#: plugins/admin/applications/class_applicationGeneric.inc:38
-msgid ""
-"There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
-msgstr ""
-"Die Einstellung 'KDE_APPLICATIONS_MENU' ist nicht in ihrer gosa.conf "
-"vorhanden."
+msgid "Move down"
+msgstr "Nach unten bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:603
-#: plugins/admin/groups/class_groupApplication.inc:606
-#: plugins/admin/applications/class_applicationGeneric.inc:46
-#: plugins/admin/applications/class_applicationGeneric.inc:49
-#, php-format
-msgid ""
-"The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not "
-"accessable."
-msgstr ""
-"Auf die für 'KDE_APPLICATIONS_MENU' angegebene Datei '%s' kann nicht "
-"zugegriffen werden."
+#: plugins/admin/groups/class_groupApplication.inc:592
+msgid "Insert seperator"
+msgstr "Feldtrenner einfügen"
+
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Gruppen-Einstellungen"
 
 #: plugins/admin/users/password.tpl:2
 msgid ""
@@ -5696,138 +6264,127 @@ msgstr ""
 "Benutzer ohne dieses Passwort nicht anmelden kann."
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:65 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: 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:247
-#: plugins/admin/users/class_userManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:404
 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:353
+#: plugins/admin/users/class_userManagement.inc:440
 #, 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:359
-#: plugins/admin/users/class_userManagement.inc:387
+#: plugins/admin/users/class_userManagement.inc:446
+#: plugins/admin/users/class_userManagement.inc:474
 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:488
-#: plugins/admin/systems/class_workstationStartup.inc:49
-#: plugins/admin/ogroups/class_ogroup.inc:235
+#: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:559
+#: plugins/admin/users/class_userManagement.inc:646
 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:674
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:675
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:675
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 msgid "Username"
 msgstr "Benutzername"
 
-#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/users/class_userManagement.inc:824
 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:726
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:727
+#: plugins/admin/users/class_userManagement.inc:856
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/users/class_userManagement.inc:858
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/users/class_userManagement.inc:860
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/users/class_userManagement.inc:862
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:735
+#: plugins/admin/users/class_userManagement.inc:864
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/users/class_userManagement.inc:866
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:868
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:740
+#: plugins/admin/users/class_userManagement.inc:869
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:870
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:929
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr "inaktiv"
 
-#: plugins/admin/users/class_userManagement.inc:1020
+#: plugins/admin/users/class_userManagement.inc:1181
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:918
 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/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -5839,6 +6396,7 @@ msgstr ""
 "GOsa gibt, die Daten wiederherzustellen. "
 
 #: plugins/admin/users/headpage.tpl:6
+#: plugins/admin/systems/glpiSelectUser.tpl:6
 msgid "List of users"
 msgstr "Liste der Benutzer"
 
@@ -5901,48 +6459,63 @@ msgstr "Zeige Proxy-Benutzer"
 msgid "User administration"
 msgstr "Benutzerverwaltung"
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
+#: 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/applications/class_applicationParameters.inc:52
 msgid "Remove options"
 msgstr "Optionen entfernen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/applications/class_applicationParameters.inc:53
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 "Diese Anwendung besitzt Optionen. Sie können diese durch Betätigen der "
 "Schaltfläche unten entfernen."
 
-#: plugins/admin/applications/class_applicationParameters.inc:53
+#: plugins/admin/applications/class_applicationParameters.inc:55
 msgid "Create options"
 msgstr "Optionen aktivieren"
 
-#: plugins/admin/applications/class_applicationParameters.inc:54
+#: plugins/admin/applications/class_applicationParameters.inc:56
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
 "Diese Anwendung besitzt keine Optionen. Sie können diese durch Betätigen der "
 "Schaltfläche unten hinzufügen."
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:93
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:93
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Standardwert"
 
-#: plugins/admin/applications/class_applicationParameters.inc:101
+#: plugins/admin/applications/class_applicationParameters.inc:104
 msgid "Add option"
 msgstr "Option hinzufügen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:152
+#: plugins/admin/applications/class_applicationParameters.inc:158
 #, 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/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:357
+#: plugins/admin/applications/class_applicationGeneric.inc:416
+#: plugins/admin/applications/class_applicationManagement.inc:521
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -5952,6 +6525,7 @@ msgid "Display name"
 msgstr "Angezeigter Name"
 
 #: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:421
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
@@ -5963,34 +6537,38 @@ 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:83
+msgid "Place entry in members launch bar"
+msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
+
 #: 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 "
@@ -6014,11 +6592,11 @@ 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: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"
 
@@ -6027,57 +6605,66 @@ msgstr "Regul
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:102
+#: plugins/admin/applications/class_applicationGeneric.inc:96
 msgid "no example"
 msgstr "kein Beispiel"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:123
+#: 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:238
+#: plugins/admin/applications/class_applicationGeneric.inc:231
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:319
+#: plugins/admin/applications/class_applicationGeneric.inc:306
+msgid "Specified execute path must start with '/'."
+msgstr "Der angegebene Ausführungspfad muss zwingend mit '/' beginnen."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:320
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Anwendung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:324
+#: plugins/admin/applications/class_applicationGeneric.inc:325
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:328
+#: plugins/admin/applications/class_applicationGeneric.inc:329
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:332
+#: plugins/admin/applications/class_applicationGeneric.inc:333
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:341
+#: plugins/admin/applications/class_applicationGeneric.inc:348
+#: plugins/admin/applications/class_applicationGeneric.inc:356
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
-#: plugins/admin/applications/class_applicationManagement.inc:250
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+msgid "Application settings"
+msgstr "Anwendungs-Einstellungen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:376
 #, 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:256
-#: plugins/admin/applications/class_applicationManagement.inc:282
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
 msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/applications/class_applicationManagement.inc:477
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
@@ -6107,23 +6694,23 @@ msgstr "Kategorie dieses Unterbaums"
 msgid "Choose subtree to place department in"
 msgstr "Wählen Sie den Unterbaum, in den die Abteilung eingepflegt werden soll"
 
-#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:48
 msgid "State where this subtree is located"
 msgstr "Land, in dem dieser Unterbaum anzusiedeln ist"
 
-#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/generic.tpl:52
 msgid "Location of this subtree"
 msgstr "Ort dieses Unterbaums"
 
-#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:56
 msgid "Postal address of this subtree"
 msgstr "Postalische Anschrift dieses Unterbaums"
 
-#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/generic.tpl:60
 msgid "Base telephone number of this subtree"
 msgstr "Einleitende Telefonnummer dieses Unterbaums"
 
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Einleitende Fax-Nummer dieses Unterbaums"
 
@@ -6164,139 +6751,186 @@ msgstr "Regul
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:143
+#: plugins/admin/departments/class_departmentGeneric.inc:185
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-#: plugins/admin/departments/class_departmentGeneric.inc:152
+#: plugins/admin/departments/class_departmentGeneric.inc:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:160
+#: plugins/admin/departments/class_departmentGeneric.inc:202
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:165
+#: plugins/admin/departments/class_departmentGeneric.inc:207
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr "Das Feld 'Name' enthält das reservierte Wort 'incoming'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/admin/departments/class_departmentGeneric.inc:208
 msgid " Please choose another name."
 msgstr "Bitte wählen Sie einen anderen Namen."
 
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr "Verschiebe %s nach %s"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, 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/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/ogroups/class_ogroupManagement.inc:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:188
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:178
+#: plugins/admin/departments/class_departmentManagement.inc:186
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:205
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:203
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
 msgid "You have no permission to remove this department."
 msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/departments/class_departmentManagement.inc:301
 msgid "Create new department"
 msgstr "Neue Abteilung erstellen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
 
-#: plugins/admin/departments/class_departmentManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:318
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_departmentManagement.inc:395
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/systems/class_terminalInfo.inc:53
-#: plugins/admin/systems/class_terminalInfo.inc:181
+#: plugins/admin/departments/recursive_move.tpl:2
+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/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "vorhanden"
 
-#: plugins/admin/systems/class_terminalInfo.inc:65
-#: plugins/admin/systems/class_terminalService.inc:139
+#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_workstationService.inc:124
-#: plugins/admin/systems/class_workstationStartup.inc:215
-#: plugins/admin/systems/class_terminalGeneric.inc:130
+#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationStartup.inc:369
+#: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
-#: plugins/admin/systems/class_terminalInfo.inc:72
+#: 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:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
+msgid "unknown status"
+msgstr "unbekannter Status"
+
+#: 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:92
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "aktiv"
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "läuft"
 
-#: plugins/admin/systems/class_terminalInfo.inc:147
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "läuft nicht"
 
-#: plugins/admin/systems/class_terminalInfo.inc:155
-msgid "unknown status"
-msgstr "unbekannter Status"
-
-#: plugins/admin/systems/class_terminalInfo.inc:173
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "inaktiv"
 
 #: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+msgid "Network\tsettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: plugins/admin/systems/network.tpl:8
+#: plugins/admin/systems/network.tpl:9
 msgid "IP-address"
 msgstr "IP-Adresse"
 
-#: plugins/admin/systems/network.tpl:16
+#: plugins/admin/systems/network.tpl:13
 msgid "MAC-address"
 msgstr "MAC-Adresse"
 
+#: plugins/admin/systems/network.tpl:29
+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:67
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: plugins/admin/systems/network.tpl:34
+msgid "Zone"
+msgstr "Zone"
+
+#: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/servdnseditzone.tpl:85
+msgid "TTL"
+msgstr "TTL"
+
+#: plugins/admin/systems/network.tpl:47
+msgid "Dns records"
+msgstr "DNS-Einträge"
+
 #: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:51
+#: plugins/admin/systems/class_componentGeneric.inc:50
 msgid "This 'dn' has no network features."
 msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_winGeneric.inc:142
-#: plugins/admin/systems/class_componentGeneric.inc:113
-msgid "The required field 'Component name' is not set."
-msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
-
-#: plugins/admin/systems/class_winGeneric.inc:156
-#: plugins/admin/systems/class_componentGeneric.inc:126
+#: plugins/admin/systems/class_winGeneric.inc:162
+#: plugins/admin/systems/class_componentGeneric.inc:145
 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:166
-#: plugins/admin/systems/class_phoneGeneric.inc:302
-#: plugins/admin/systems/class_terminalGeneric.inc:260
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:214
-#: plugins/admin/systems/class_printGeneric.inc:456
-#: plugins/admin/systems/class_componentGeneric.inc:136
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#: 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:529
+#: plugins/admin/systems/class_componentGeneric.inc:155
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -6400,52 +7034,52 @@ msgstr "Audio-Dienst"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:83
-#: plugins/admin/systems/class_workstationService.inc:68
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "default"
 msgstr "Standard"
 
-#: plugins/admin/systems/class_terminalService.inc:84
-#: plugins/admin/systems/class_workstationService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "show chooser"
 msgstr "zeige Auswahl"
 
-#: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:91
 msgid "direct"
 msgstr "direkt"
 
-#: plugins/admin/systems/class_terminalService.inc:88
-#: plugins/admin/systems/class_workstationService.inc:73
+#: plugins/admin/systems/class_terminalService.inc:107
+#: plugins/admin/systems/class_workstationService.inc:94
 msgid "load balanced"
 msgstr "lastverteilt"
 
-#: plugins/admin/systems/class_terminalService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:76
+#: plugins/admin/systems/class_terminalService.inc:110
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:77
+#: plugins/admin/systems/class_terminalService.inc:111
+#: plugins/admin/systems/class_workstationService.inc:98
 msgid "ICA client"
 msgstr "Citrix Metaframe"
 
-#: plugins/admin/systems/class_terminalService.inc:187
-#: plugins/admin/systems/class_workstationService.inc:171
+#: plugins/admin/systems/class_terminalService.inc:209
+#: plugins/admin/systems/class_workstationService.inc:201
 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:251
-#: plugins/admin/systems/class_terminalService.inc:256
-#: plugins/admin/systems/class_workstationService.inc:236
-#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+#: 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:266
-#: plugins/admin/systems/class_terminalService.inc:271
-#: plugins/admin/systems/class_workstationService.inc:251
-#: plugins/admin/systems/class_workstationService.inc:256
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+#: 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."
 
@@ -6453,14 +7087,10 @@ msgstr "Bitte geben Sie einen g
 msgid "System management"
 msgstr "Systemverwaltung"
 
-#: plugins/admin/systems/class_servService.inc:264
+#: plugins/admin/systems/class_servService.inc:272
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "NFS-Freigabe"
-
 #: plugins/admin/systems/servservice.tpl:37
 msgid "Time Service"
 msgstr "Zeit-Dienst"
@@ -6609,6 +7239,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:23
 msgid "Telephone hardware"
 msgstr "Telefon-Hardware"
 
@@ -6616,11 +7247,12 @@ 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:25
 msgid "Telephone"
 msgstr "Telefon"
 
 #: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:45
+#: plugins/admin/systems/printer.tpl:46
 #: plugins/admin/systems/terminalService.tpl:86
 msgid "Driver"
 msgstr "Treiber"
@@ -6651,37 +7283,45 @@ msgstr "W
 msgid "Display device"
 msgstr "Anzeige"
 
-#: plugins/admin/systems/workstationService.tpl:124
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr "unbekannt"
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr "Automatische Modelines"
+
+#: plugins/admin/systems/workstationService.tpl:130
 #: plugins/admin/systems/terminalService.tpl:124
 msgid "HSync"
 msgstr "HSync"
 
-#: plugins/admin/systems/workstationService.tpl:126
+#: plugins/admin/systems/workstationService.tpl:132
 #: plugins/admin/systems/terminalService.tpl:126
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr "Horizontale Wiederholrate für den installierten Monitor"
 
-#: plugins/admin/systems/workstationService.tpl:129
+#: plugins/admin/systems/workstationService.tpl:135
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
 msgstr "VSync"
 
-#: plugins/admin/systems/workstationService.tpl:131
+#: plugins/admin/systems/workstationService.tpl:137
 #: plugins/admin/systems/terminalService.tpl:131
 msgid "Vertical refresh frequency for installed monitor"
 msgstr "Vertikale Wiederholrate für den installierten Monitor"
 
-#: plugins/admin/systems/workstationService.tpl:143
+#: plugins/admin/systems/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr "Scanner"
 
-#: plugins/admin/systems/workstationService.tpl:144
+#: plugins/admin/systems/workstationService.tpl:150
 #: plugins/admin/systems/terminalService.tpl:204
 msgid "Select to start SANE scan service on terminal"
 msgstr "Wählen, um den SANE Scanner-Dienst auf dem Terminal zu starten"
 
-#: plugins/admin/systems/workstationService.tpl:145
+#: plugins/admin/systems/workstationService.tpl:151
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr "Bilderfassungsdienste bereitstellen"
@@ -6702,12 +7342,21 @@ 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_workstationStartup.inc:197
+#: plugins/admin/systems/class_workstationStartup.inc:310
+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:351
 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:251
+#: plugins/admin/systems/class_workstationStartup.inc:407
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -6715,29 +7364,51 @@ msgstr ""
 "In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
 "für Partitionstabellen enthält."
 
+#: plugins/admin/systems/class_workstationStartup.inc:725
+#, 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:736
+#, 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/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "yes"
 msgstr "ja"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "no"
 msgstr "nein"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:198
+#: plugins/admin/systems/class_phoneGeneric.inc:223
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:198
+#: plugins/admin/systems/class_phoneGeneric.inc:223
 msgid "Networksettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:216
+#: plugins/admin/systems/class_phoneGeneric.inc:238
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
@@ -6746,39 +7417,25 @@ 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:273
+#: plugins/admin/systems/class_phoneGeneric.inc:294
 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:276
+#: plugins/admin/systems/class_phoneGeneric.inc:297
 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:279
-#: plugins/admin/systems/class_componentGeneric.inc:116
-msgid "The required field 'MAC-address' is not set."
-msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:282
-#: plugins/admin/systems/class_componentGeneric.inc:119
-msgid "The required field 'IP-address' is not set."
-msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:285
-msgid "Wrong IP format in field IP-address."
-msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_phoneGeneric.inc:304
 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_printerPPDDialog.inc:64
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
 #, 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:105
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
 #, php-format
 msgid ""
 "The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
@@ -6787,46 +7444,46 @@ msgstr ""
 "Der in Ihrer 'gosa.conf' angegebene PPD-Pfad (PPD_PATH) '%s' ist ungültig - "
 "kann daher keine ppd-Informationen lesen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:106
+#: 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:122
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
 #, 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:135
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
 #, 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:143
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
 #, php-format
 msgid "Can't save file '%s'."
 msgstr "Kann Datei '%s' nicht speichern."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:162
-#: plugins/admin/systems/class_printerPPDDialog.inc:165
+#: 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:189
+#: 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:363
-#: plugins/admin/systems/class_printerPPDDialog.inc:366
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
 msgid "True"
 msgstr "wahr"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:364
-#: plugins/admin/systems/class_printerPPDDialog.inc:367
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
 msgid "False"
 msgstr "falsch"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
@@ -6835,84 +7492,86 @@ msgstr "Nicht unterst
 msgid "Server name"
 msgstr "Server-Name"
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Aktion"
 
-#: plugins/admin/systems/server.tpl:42
+#: plugins/admin/systems/server.tpl:43
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_terminalGeneric.inc:61
 msgid "text"
 msgstr "textuell"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:64
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_terminalGeneric.inc:90
 #: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:62
+#: 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:96
-#: plugins/admin/systems/class_terminalGeneric.inc:108
-#: plugins/admin/systems/class_terminalGeneric.inc:120
+#: 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:101
-#: plugins/admin/ogroups/class_termgroup.inc:66
-#: plugins/admin/ogroups/class_termgroup.inc:78
-#: plugins/admin/ogroups/class_termgroup.inc:90
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:102
 #: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:74
+#: 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:116
+#: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:86
+#: 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:147
-#: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:147
-#: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:149
-#: plugins/admin/systems/class_servGeneric.inc:117
-#: plugins/admin/systems/class_workstationGeneric.inc:131
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: plugins/admin/systems/class_terminalGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:142
+#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:243
+#: plugins/admin/systems/class_terminalGeneric.inc:269
 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:247
+#: plugins/admin/systems/class_terminalGeneric.inc:273
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
@@ -6921,7 +7580,7 @@ msgid "Printer driver"
 msgstr "Drucker-Treiber"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 msgid "Select"
 msgstr "Auswahl"
 
@@ -6939,30 +7598,23 @@ msgstr "Boot-Parameter"
 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/workstationStartup.tpl:13
+#: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Boot-Kernel"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
+#: plugins/admin/systems/workstationStartup.tpl:15
+#: plugins/admin/systems/terminalStartup.tpl:15
 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/terminalStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:18
+#: plugins/admin/systems/terminalStartup.tpl:18
 msgid "Custom options"
 msgstr "Angepasste Optionen"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:20
+#: plugins/admin/systems/terminalStartup.tpl:20
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
@@ -6970,25 +7622,30 @@ msgstr ""
 "Geben Sie die Parameter ein, die dem Kernel beim Starten übergeben werden "
 "sollen"
 
-#: plugins/admin/systems/workstationStartup.tpl:35
+#: plugins/admin/systems/workstationStartup.tpl:33
 msgid "FAI server"
 msgstr "FAI-Server"
 
-#: plugins/admin/systems/workstationStartup.tpl:42
+#: plugins/admin/systems/workstationStartup.tpl:50
 msgid "Assigned FAI classes"
 msgstr "Zugewiesene FAI-Klassen"
 
-#: plugins/admin/systems/workstationStartup.tpl:62
-#: plugins/admin/systems/terminalStartup.tpl:53
+#: plugins/admin/systems/workstationStartup.tpl:69
+#: plugins/admin/systems/terminalStartup.tpl:49
 msgid "Kernel modules (format: name parameters)"
 msgstr "Kernel-Module (Format: Name Parameter)"
 
-#: plugins/admin/systems/workstationStartup.tpl:64
-#: plugins/admin/systems/terminalStartup.tpl:55
+#: plugins/admin/systems/workstationStartup.tpl:71
+#: plugins/admin/systems/terminalStartup.tpl:51
 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:95
+#: plugins/admin/systems/terminalStartup.tpl:75
+msgid "Mountpoint"
+msgstr "Mount-Pfad"
+
 #: plugins/admin/systems/phone.tpl:6
 msgid "Phone name"
 msgstr "Telefon-Name"
@@ -6997,11 +7654,11 @@ msgstr "Telefon-Name"
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:191
 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:173
+#: plugins/admin/systems/class_servGeneric.inc:198
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
@@ -7015,58 +7672,58 @@ msgstr "Terminal-Vorlage"
 msgid "Terminal name"
 msgstr "Terminal-Name"
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:45
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:46
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modus"
 
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:48
 msgid "Select terminal mode"
 msgstr "Wählen Sie den Terminal-Modus"
 
-#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/terminal.tpl:53
 msgid "Root server"
 msgstr "Root-Server"
 
-#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/terminal.tpl:55
 msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
-#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/terminal.tpl:61
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
-#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/terminal.tpl:63
 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:74
-#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/terminal.tpl:75
+#: plugins/admin/systems/workstation.tpl:55
 msgid "Syslog server"
 msgstr "Protokoll-Server"
 
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:56
+#: 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:82
-#: plugins/admin/systems/workstation.tpl:62
+#: plugins/admin/systems/terminal.tpl:83
+#: plugins/admin/systems/workstation.tpl:63
 msgid "NTP server"
 msgstr "Zeit-Server"
 
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:64
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 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:103
-#: plugins/admin/systems/workstation.tpl:82
+#: plugins/admin/systems/terminal.tpl:104
+#: plugins/admin/systems/workstation.tpl:83
 msgid "Select action to execute for this terminal"
 msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
 
@@ -7079,7 +7736,7 @@ msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Dieser Server besitzt aktivierte die DHCP-Funktionen. Sie können diese durch "
+"Dieser Server besitzt aktivierte DHCP-Funktionen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
 #: plugins/admin/systems/class_servDHCP.inc:39
@@ -7099,50 +7756,150 @@ msgstr ""
 msgid "Select objects to add"
 msgstr "Wählen Sie die hinzuzufügenden Objekte"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:48
-msgid "Close"
-msgstr "Schliessen"
+#: 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_workstationGeneric.inc:68
-msgid "Activated"
-msgstr "Aktiv"
+#: 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_workstationGeneric.inc:69
-msgid "Locked"
-msgstr "Gesperrt"
+#: 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
+msgid "This feature is not implemented yet."
+msgstr "Dieses Feature wurde noch nicht implementiert."
+
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
+"Das Hinzufügen des neuen Systemtyps ist fehlgeschlagen - der angegebene Name "
+"wird bereits verwendet."
+
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
+"Sie können diesen Systemtyp nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiAccount.inc:323
+msgid "Rename failed, this system type name is already used."
+msgstr ""
+"Das Umbenennen schlug fehl: Der angegebene Name wird bereits verwendet."
+
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr ""
+"Das Hinzufügen des neuen Betriebssystems ist fehlgeschlagen - der angegebene "
+"Name wird bereits verwendet."
+
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
+"Sie können dieses Betriebssystem nicht löschen, es wird von folgenden(m) "
+"System(en) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiAccount.inc:413
+msgid "Updating operating system failed, specifed name is already used."
+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
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+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
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+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_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:97
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Systemanalyse"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:100
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/systems/class_workstationGeneric.inc:114
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:127
+#: plugins/admin/systems/class_workstationGeneric.inc:157
 msgid "Instant update"
 msgstr "Sofortiges Update"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:128
-#: plugins/admin/systems/class_workstationGeneric.inc:132
+#: plugins/admin/systems/class_workstationGeneric.inc:158
+#: plugins/admin/systems/class_workstationGeneric.inc:164
 msgid "Scheduled update"
 msgstr "Geplantes Update"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:129
+#: 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:197
+#: plugins/admin/systems/class_workstationGeneric.inc:228
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:232
 msgid "The required field 'Workstation name' is not set."
 msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 
@@ -7150,149 +7907,163 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:334
+#: plugins/admin/systems/class_systemManagement.inc:429
 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:350
+#: plugins/admin/systems/class_systemManagement.inc:455
 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:363
+#: plugins/admin/systems/class_systemManagement.inc:472
 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:407
+#: plugins/admin/systems/class_systemManagement.inc:526
 #, 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:569
+#: plugins/admin/systems/class_systemManagement.inc:761
 msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/class_systemManagement.inc:569
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:763
 msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
-#: plugins/admin/systems/class_systemManagement.inc:711
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:572
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_systemManagement.inc:582
+#: plugins/admin/systems/class_systemManagement.inc:781
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_systemManagement.inc:583
+#: plugins/admin/systems/class_systemManagement.inc:782
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_systemManagement.inc:589
+#: plugins/admin/systems/class_systemManagement.inc:792
 msgid "System"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:830
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:831
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:627
+#: plugins/admin/systems/class_systemManagement.inc:832
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:628
+#: plugins/admin/systems/class_systemManagement.inc:833
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:629
+#: plugins/admin/systems/class_systemManagement.inc:834
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:630
+#: plugins/admin/systems/class_systemManagement.inc:835
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:631
+#: plugins/admin/systems/class_systemManagement.inc:836
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:632
+#: plugins/admin/systems/class_systemManagement.inc:837
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:633
+#: plugins/admin/systems/class_systemManagement.inc:838
 msgid "Fax Server"
 msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:634
+#: plugins/admin/systems/class_systemManagement.inc:839
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:660
+#: plugins/admin/systems/class_systemManagement.inc:872
 msgid "Set root password"
 msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/class_systemManagement.inc:706
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:917
+msgid "New System from incoming"
+msgstr "Neu erkanntes Gerät"
+
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:488
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/systems/class_systemManagement.inc:923
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:713
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:1147
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:1149
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:950
+#: plugins/admin/systems/class_systemManagement.inc:1151
+msgid "New Device"
+msgstr "Neues Gerät"
+
+#: plugins/admin/systems/class_systemManagement.inc:1168
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:962
+#: plugins/admin/systems/class_systemManagement.inc:1180
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
@@ -7304,94 +8075,116 @@ msgstr "Allgemein"
 msgid "Printer name"
 msgstr "Druckername"
 
-#: plugins/admin/systems/printer.tpl:30
+#: plugins/admin/systems/printer.tpl:31
 msgid "Details"
 msgstr "Details"
 
-#: plugins/admin/systems/printer.tpl:33
+#: plugins/admin/systems/printer.tpl:34
 msgid "Printer location"
 msgstr "Drucker-Standort"
 
-#: plugins/admin/systems/printer.tpl:37
+#: plugins/admin/systems/printer.tpl:38
 msgid "Printer URL"
 msgstr "Drucker URL"
 
-#: plugins/admin/systems/printer.tpl:57
+#: plugins/admin/systems/printer.tpl:58
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: plugins/admin/systems/printer.tpl:64
+#: plugins/admin/systems/printer.tpl:65
 msgid "Users which are allowed to use this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
-#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
 msgid "Add group"
 msgstr "Gruppe hinzufügen"
 
-#: plugins/admin/systems/printer.tpl:80
+#: plugins/admin/systems/printer.tpl:81
 msgid "Users which are allowed to administrate this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/printer.tpl:82
 msgid "Admins"
 msgstr "Administratoren"
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: 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:37
+#: 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."
 msgstr ""
-"Dieser Server besitzt aktivierte die DNS-Funktionen. Sie können diese durch "
+"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:39
+#: 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:40
+#: 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."
 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_servDB.inc:134
-#: plugins/admin/systems/class_servDB.inc:150
-#: plugins/admin/systems/class_servDB.inc:160
-#: plugins/admin/systems/class_servDB.inc:165
+#: plugins/admin/systems/class_servDNS.inc:159
+msgid "Reverse zone"
+msgstr "Reverse Zone"
+
+#: 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/"
+"entries '%s'"
+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_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
 #, 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:140
+#: plugins/admin/systems/class_servDB.inc:151
 #, 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:144
+#: plugins/admin/systems/class_servDB.inc:155
 msgid "The sieve port needs to be numeric."
 msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/class_servDB.inc:155
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr "Das angebene Kerberos-Passwort ist leer."
 
-#: plugins/admin/systems/class_servDB.inc:179
+#: plugins/admin/systems/class_servDB.inc:190
 #, 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/servdns.tpl:1
+msgid "Zones"
+msgstr "Zonen"
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
@@ -7400,27 +8193,38 @@ msgstr "Vorlage f
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
-#: plugins/admin/systems/class_servNfs.inc:104
+#: plugins/admin/systems/class_servNfs.inc:35
+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
+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
 msgid "Please specify a valid path for your setup."
 msgstr "Bitte geben Sie einen gültigen Pfad an."
 
-#: plugins/admin/systems/class_servNfs.inc:110
+#: plugins/admin/systems/class_servNfs.inc:131
 msgid "Please specify a valid name for your setup."
 msgstr "Bitte geben Sie einen gültigen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:113
+#: plugins/admin/systems/class_servNfs.inc:134
 msgid "Please specify a name for your setup."
 msgstr "Bitte geben Sie einen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:118
+#: plugins/admin/systems/class_servNfs.inc:139
 msgid "Description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:122
+#: plugins/admin/systems/class_servNfs.inc:143
 msgid "Path contains invalid characters."
 msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:147
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
@@ -7480,23 +8284,35 @@ msgstr "Sieve-Port"
 msgid "Logging database"
 msgstr "Protokoll-Datenbank"
 
-#: plugins/admin/systems/servdb.tpl:104
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
 msgid "Logging DB user"
 msgstr "Protokoll-DB Benutzer"
 
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Glpi-Datenbank"
+
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Datenbank"
+
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Freigabe bearbeiten"
+
 #: plugins/admin/systems/servnfs.tpl:2
 msgid "NFS setup"
 msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/servnfs.tpl:41
-msgid "Charset"
-msgstr "Zeichensatz"
-
-#: plugins/admin/systems/servnfs.tpl:63
+#: plugins/admin/systems/servnfs.tpl:25
 msgid "Path"
 msgstr "Pfad"
 
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr "Codepage"
+
+#: plugins/admin/systems/servnfs.tpl:59
 msgid "Option"
 msgstr "Option"
 
@@ -7509,7 +8325,7 @@ msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Dieser Server besitzt aktivierte die Kolab-Funtionen. Sie können diese durch "
+"Dieser Server besitzt aktivierte Kolab-Funtionen. Sie können diese durch "
 "einen Klick auf die Schaltfläche unten deaktivieren."
 
 #: plugins/admin/systems/class_servKolab.inc:118
@@ -7536,41 +8352,48 @@ 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:224
+#: plugins/admin/systems/class_servKolab.inc:227
 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:226
+#: plugins/admin/systems/class_servKolab.inc:229
 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:230
+#: plugins/admin/systems/class_servKolab.inc:233
 msgid "The given Quota settings value must be a number."
 msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/class_servKolab.inc:232
+#: plugins/admin/systems/class_servKolab.inc:235
 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:234
+#: plugins/admin/systems/class_servKolab.inc:237
 msgid "Future days must be a value."
 msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/class_servKolab.inc:238
+#: plugins/admin/systems/class_servKolab.inc:241
 msgid "No SMTP privileged networks set."
 msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
 
-#: plugins/admin/systems/class_servKolab.inc:242
-msgid "No SMTP smarthost/relayhost set."
-msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
-
-#: plugins/admin/systems/class_printGeneric.inc:194
-#: plugins/admin/systems/class_printGeneric.inc:215
-#: plugins/admin/systems/class_printGeneric.inc:218
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
 msgid "Add printer extension"
 msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_printGeneric.inc:195
+#: plugins/admin/systems/class_printGeneric.inc:178
+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:185
+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:220
 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 "
@@ -7581,12 +8404,12 @@ msgstr ""
 "enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
 "Vorlage."
 
-#: plugins/admin/systems/class_printGeneric.inc:207
-#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
 msgid "Remove printer extension"
 msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_printGeneric.inc:208
+#: plugins/admin/systems/class_printGeneric.inc:233
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -7594,7 +8417,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:211
+#: plugins/admin/systems/class_printGeneric.inc:236
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -7602,7 +8425,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:216
+#: plugins/admin/systems/class_printGeneric.inc:241
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -7610,7 +8433,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:219
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -7618,32 +8441,32 @@ 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:230
+#: plugins/admin/systems/class_printGeneric.inc:283
 msgid "This 'dn' has no printer features."
 msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/class_printGeneric.inc:362
+#: plugins/admin/systems/class_printGeneric.inc:419
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: plugins/admin/systems/class_printGeneric.inc:370
+#: plugins/admin/systems/class_printGeneric.inc:427
 msgid "can't get ppd informations."
 msgstr "keine PPD-Informationen verfügbar"
 
-#: plugins/admin/systems/class_printGeneric.inc:382
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
 
-#: plugins/admin/systems/class_printGeneric.inc:384
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
 "möglich."
 
-#: plugins/admin/systems/class_printGeneric.inc:446
+#: plugins/admin/systems/class_printGeneric.inc:519
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
@@ -7881,11 +8704,6 @@ msgstr ""
 "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"
@@ -7954,29 +8772,33 @@ msgstr "Zeige Systeme des Benutzers"
 msgid "User name of which terminal(s) are shown"
 msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
+#: plugins/admin/systems/class_componentGeneric.inc:138
+msgid "The required field 'Component name' is not set."
+msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
+
+#: plugins/admin/systems/terminalStartup.tpl:31
 msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 "Wählen, wenn das Terminal den grafischen Startvorgang mit Fortschrittsbalken "
 "unterstützt"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
+#: plugins/admin/systems/terminalStartup.tpl:32
 msgid "use graphical bootup"
 msgstr "grafisches Booten nutzen"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
+#: plugins/admin/systems/terminalStartup.tpl:34
 msgid "Select if terminal should boot in text mode"
 msgstr "Wählen, wenn das Terminal im Textmodus starten soll"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
+#: plugins/admin/systems/terminalStartup.tpl:35
 msgid "use standard linux textual bootup"
 msgstr "Standard Textmodus nutzen"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
+#: plugins/admin/systems/terminalStartup.tpl:37
 msgid "Select to get more verbose output during startup"
 msgstr "Wählen, um ausführlichere Informationen während des Starts zu erhalten"
 
-#: plugins/admin/systems/terminalStartup.tpl:42
+#: plugins/admin/systems/terminalStartup.tpl:38
 msgid "use debug mode for startup"
 msgstr "benutze Fehlersuch-Modus"
 
@@ -8005,13 +8827,1078 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Auswahl der Drucker-PPD"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:151
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
+msgstr "Parent-Server"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: 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
+msgid "Please enter a value for 'release'."
+msgstr "Bitte geben Sie einen Wert für 'Release' ein."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
+msgid "Please specify a valid value for 'url'."
+msgstr "Bitte geben Sie im Feld 'url' einen gültigen Wert ein."
+
+#: 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: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_glpiPrinterAccount.inc:203
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"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_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_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_glpiPrinterAccount.inc:750
+msgid "since"
+msgstr "seit"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "System-Typen verwalten"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+msgid "Please enter a new name"
+msgstr "Bitte geben Sie einen neuen Namen ein"
+
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Es ist eine gute Idee, vor dieser Aktion eine komplette Sicherung Ihrer "
+"MySQL-Datenbank zu erstellen. Wenn Sie dies erledigt haben, drücken Sie "
+"'Entfernen', um fortzufahren oder 'Abbrechen', um die aktuelle Aktion "
+"abzubrechen."
+
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Hersteller verwalten"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referenz"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/glpi_devices.tpl:17
+msgid "Comments"
+msgstr "Kommentare"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+msgid "Comment"
+msgstr "Kommentar"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+msgid "Manufacturer"
+msgstr "Hersteller"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+msgid "Technical responsible"
+msgstr "Technischer Kontakt"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+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_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "Betriebssysteme verwalten"
+
+#: plugins/admin/systems/class_termDNS.inc:258
+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:265
+msgid "Wrong IP format in field IP-address."
+msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
+
+#: plugins/admin/systems/class_termDNS.inc:272
+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:279
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
+"Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 1-Byte Segmente "
+"angegeben werden (getrennt durch ':')."
+
+#: plugins/admin/systems/class_termDNS.inc:299
+#, 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:307
+#, 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:318
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+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:325
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Hersteller hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Website"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr "Verfügbare Patronentypen für diesen Druckertyp"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, neue Arten von Patronen hinzuzufügen und "
+"einen oder mehrere Typen zu Ihrem Drucker zuzuordnen. Patronentypen sind "
+"abhängig von Ihrem gewählten Druckertyp. Für jeden gewählten Patronentyp "
+"wird eine neue Patrone erstellt. Dies erlaubt es Ihnen, den gleichen "
+"Patronentyp für mehr als einen Drucker zu verwenden."
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "Zeige die Patronentypen, auf die Folgendes passt"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "Regulärer Ausdruck zum Erkennen von Patronentypen"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Bitte geben Sie einen Namen ein!"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+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/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Anhänge"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, verschiedene Objekte (wie Anleitungen, "
+"Hilfen, etc.) zum momentan gewählten Computer hinzuzufügen."
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Zeige Anhänge, auf die zutrifft"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Regulärer Ausdruck zur Suche nach Anhangs-Namen"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+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
+msgid "The selected name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "System-Typ"
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Betriebssystem"
+
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "Kontaktperson"
+
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Installierte Geräte"
+
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "Handeln"
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Software"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Verträge"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Zonenname"
+
+#: 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 "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: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:57
+msgid "Serial number (automatically incremented)"
+msgstr "Seriennummer (automatisch inkrementiert)"
+
+#: 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:79
+msgid "Expire"
+msgstr "Ablauf"
+
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
+msgstr "MX-Einträge"
+
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Zone records"
+msgstr "Zonen-Einträge"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste der Geräte"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, ein Gerät zum momentan ausgewählten Computer "
+"hinzuzufügen."
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Zeige die Geräte, auf die das Folgende passt"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Sind sind dabei, den GLPI Anhang '%s' zu löschen."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr ""
+"Sie können diesen Anhang nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
+msgstr "Es wurde keine gültige Datei hochgeladen."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
+msgstr "Upload war nicht erfolgreich."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+msgstr ""
+"Das Verzeichnis /etc/gosa/glpi/ zum Speichern von GLPI-Uploads wurde nicht "
+"gefunden."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
+msgstr "Es wurde bereits eine Datei mit dem selben Namen hochgeladen."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Kann Datei '%s' nicht anlegen."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
+msgstr "Datei ist verfügbar."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
+msgstr "Datei konnte nicht gelesen werden, vielleicht ist nicht vorhanden."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
+msgstr "Es wurde noch keine Datei hochgeladen."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
+msgstr "MIME"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
+msgstr "Diese Tabelle enthält alle verfügbaren Anhänge."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
+msgstr "leer"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
+msgstr "Neuen Anhang erstellen"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Neuer Anhang"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr "Interner Fehler: Kann Gerät von Typ '%s' nicht anlegen."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Sie sind dabei das GLPI Gerät '%s' zu löschen."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr "Kann Objektnamen nicht erkennen."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
+"Sie können dieses Gerät nicht entfernen, es wird noch von folgendem(n) System"
+"(en) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "Geräte"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "New monitor"
+msgstr "Neuer Monitor"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "M"
+msgstr "M"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Neues Mainboard"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Neuer Prozessor"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Neues Gehäuse"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr "C"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Neues Netzwerk-Interface"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr "NI"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Neuer Arbeitsspeicher"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr "R"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Neue Festplatte"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "HDD"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr "Neues Laufwerk"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr "D"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Neuer Controller"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr "CS"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr "Neue Grafikkarte"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr "GC"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Neue Soundkarte"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr "SC"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr "Neues Netzteil"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr "PS"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Neues allgemeines Gerät"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr "OC"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+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
+msgid "This device name is already in use."
+msgstr "Der angegebene Gerätename wird bereits verwendet."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
+msgstr "Andere"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Druckertyp"
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr "Unterstützte Schnittstellen"
+
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Seriell"
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr "Parallel"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr "USB"
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Installierte Patronen"
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Sind sind dabei, den GLPI Patronentyp '%s' zu löschen."
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+"Sie können diesen Patronentyp nicht entfernen, er wird noch von folgendem(n) "
+"Drucker(n) verwendet: '%s'"
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr "Patronen"
+
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
+msgstr "Monitor hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr "Monitorgröße"
+
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr "Zoll"
+
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr "Integriertes Mikrofon"
+
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr "ja"
+
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr "nein"
+
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr "Integrierte Lautsprecher"
+
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr "Sub-D"
+
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr "BNC"
+
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr "Seriennumner"
+
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr "Zusätzliche Seriennummer"
+
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
+msgstr "Allgemeines Gerät hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr "Netzteil hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr "ATX"
+
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr "Strom"
+
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
+msgstr "Grafikkarte hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr "Interface"
+
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr "RAM"
+
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
+msgstr "Controller hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr "Laufwerk hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
+msgstr "Taktung"
+
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
+msgstr "Beschreibbar"
+
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
+msgstr "Festplatte hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr "Upm"
+
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
+msgstr "Cache"
+
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
+msgstr "Speicher hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
+msgstr "Frequenz"
+
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
+msgstr "Soundkarte hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
+msgstr "Netzwerk-Interface hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "MAC-Adresse"
+
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
+msgstr "Prozessor hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Frequenz"
+
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Standardfrequenz"
+
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Motherboard hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipsatz"
+
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Computergehäuse hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
+msgstr "Format"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Anhang"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Dateiname"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "MIME-Typ"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:349
+msgid "This zoneName is already in use"
+msgstr "Der angegebene Zonen-Name wird bereits verwendet."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+msgid "This reverse zone is already in use"
+msgstr "Die reverse-Zone wird bereits verwendet."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:357
+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:361
+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:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:369
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+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:373
+msgid "Only lowercase strings are allowed as zone name."
+msgstr "Für den Zonennamen sind nur Kleinbuchstaben zugelassen."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:377
+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:381
+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:385
+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:389
+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:393
+msgid "Please specify a numeric value for retry."
+msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
+
+#: 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."
+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."
+
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid "Please select a system type and if prefered select a object group too."
+msgstr ""
+"Bitte wählen Sie einen Systemtyp (und wenn  gewünscht eine Objektgruppe)."
+
+#: 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"
+
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose a object group"
+msgstr "Objektgruppe wä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:199
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
+msgstr "Der Eintragsname '%s' enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:208
+#, 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:214
+#, 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:223
+#, 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:229
+#, 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:246
+#, 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:253
+#, 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:261
+#, 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:352
+#, php-format
+msgid "Settings for '%s'"
+msgstr "Einstellungen für '%s'"
+
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "FAI-Repository-Erweiterung entfernen"
+
+#: 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_baseSelectDialog.inc:23
+msgid "Choose a base"
+msgstr "Wählen Sie eine Basis"
+
+#: 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."
+msgstr ""
+"Wechseln Sie in den gewünschten Baum und klicken Sie \"Speichern\", um den "
+"Baum als Basis zu nutzen (Oder klicken sie auf das Bild am Ende des "
+"Eintrags)."
+
+#: 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:115
+#, php-format
+msgid "Select this base"
+msgstr "Diese Basis auswählen"
+
+#: 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/tabs_ogroups.inc:58
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
 msgid "Phone queue"
 msgstr "Warteschlange"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:84
-#: plugins/admin/ogroups/tabs_ogroups.inc:131
+#: plugins/admin/ogroups/tabs_ogroups.inc:83
+#: plugins/admin/ogroups/tabs_ogroups.inc:130
 msgid "Terminals"
 msgstr "Arbeitsplätze"
 
@@ -8098,100 +9985,104 @@ 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:218
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:224
-#: plugins/admin/ogroups/class_ogroupManagement.inc:250
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
 msgid "You are not allowed to delete this object group!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
 msgid "Create new object group"
 msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Name of object groups"
 msgstr "Name der Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:441
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:127
+#: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Diese 'dn' ist keine Objektgruppenerweiterungen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:237
+#: plugins/admin/ogroups/class_ogroup.inc:279
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:239
+#: plugins/admin/ogroups/class_ogroup.inc:281
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/ogroups/class_ogroup.inc:282
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:241
+#: plugins/admin/ogroups/class_ogroup.inc:283
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:284
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:243
+#: plugins/admin/ogroups/class_ogroup.inc:285
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:286
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:245
+#: plugins/admin/ogroups/class_ogroup.inc:287
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:247
+#: plugins/admin/ogroups/class_ogroup.inc:289
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:254
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "and"
 msgstr "und"
 
-#: plugins/admin/ogroups/class_ogroup.inc:405
+#: plugins/admin/ogroups/class_ogroup.inc:508
 msgid "Non existing dn: "
 msgstr "Unbekannte dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:536
+#: plugins/admin/ogroups/class_ogroup.inc:648
+msgid "There is already an object with this cn."
+msgstr "Diese cn ist bereits vergeben."
+
+#: plugins/admin/ogroups/class_ogroup.inc:665
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
@@ -8265,35 +10156,35 @@ msgstr ""
 "Diese Gruppe besitzt keine gültigen Warteschlangen-Erweiterung. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:199
 msgid "Timeout must be numeric"
 msgstr "Der Wert für 'Wartezeit' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 msgid "Retry must be numeric"
 msgstr "Der Wert für 'Wiederholen' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Max queue length must be numeric"
 msgstr "Der Wert für 'Maximale Grösse der Warteschlange' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Announce frequency must be numeric"
 msgstr "Der Wert für 'Benachrichtigungsfrequenz' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:214
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:228
+#: plugins/admin/ogroups/class_phonequeue.inc:225
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Im Moment ist kein Asterisk-Server definiert. Ihre Einstellungen können "
 "nicht gespeichert werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:238
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -8302,41 +10193,41 @@ msgstr ""
 "MySQL-Server '%s' kann nicht als Benutzer '%s' erreicht werden, überprüfen "
 "Sie das GOsa Protokoll auf MySQL-Fehlermeldungen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:251
-#: plugins/admin/ogroups/class_phonequeue.inc:625
-#: plugins/gofon/macro/class_gofonMacro.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:624
+#: plugins/gofon/macro/class_gofonMacro.inc:216
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:259
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:375
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1047
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:282
-#: plugins/admin/ogroups/class_phonequeue.inc:496
-#: plugins/admin/ogroups/class_phonequeue.inc:661
+#: plugins/admin/ogroups/class_phonequeue.inc:279
+#: plugins/admin/ogroups/class_phonequeue.inc:493
+#: plugins/admin/ogroups/class_phonequeue.inc:660
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "Kann Datenbank '%s' auf Server '%s' nicht löschen."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/admin/ogroups/class_phonequeue.inc:528
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:415
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:417
+#: plugins/admin/ogroups/class_phonequeue.inc:523
+#: plugins/admin/ogroups/class_phonequeue.inc:525
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1152
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:615
-#: plugins/gofon/macro/class_gofonMacro.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:614
+#: plugins/gofon/macro/class_gofonMacro.inc:205
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:364
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -8406,6 +10297,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"
 
@@ -8414,20 +10307,10 @@ msgstr "Telefonnummern"
 msgid "Generic queue Settings"
 msgstr "Allgemeine Warteschlangen-Einstellungen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:18
-msgid "Down"
-msgstr "Ab"
-
 #: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
 msgstr "Wartezeit"
 
-#: 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/ogroups/phonequeue.tpl:62
 msgid "Strategy"
 msgstr "Strategie"
@@ -8528,44 +10411,44 @@ msgstr "Klingelton statt Hintergrund-Musik"
 msgid "Phone macros"
 msgstr "Telefon-Makros"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:251
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Sie sind dabei das Makro '%s' zu löschen."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:282
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:346
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr "Diese Tabelle enthält alle Telefon-Markos des gewählten Unterbaumes."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:94
+#: plugins/gofon/macro/class_gofonMacro.inc:97
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:645
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -8576,12 +10459,12 @@ msgstr ""
 "Einstellungen können daher nicht in der Asterisk-Datenbank gespeichert "
 "werden."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:100
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:103
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
 msgid "This 'dn' is no phone macro."
 msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:156
+#: plugins/gofon/macro/class_gofonMacro.inc:159
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -8589,7 +10472,7 @@ msgstr ""
 "Dieses Makro ist in Benutzung. Um es zu entfernen, stellen Sie bitte "
 "zunächst sicher, dass niemand dieses Makro ausgewählt hat."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:188
+#: plugins/gofon/macro/class_gofonMacro.inc:191
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
@@ -8597,55 +10480,55 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:258
+#: plugins/gofon/macro/class_gofonMacro.inc:261
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr "Fehler beim Einlesen des Makros in Zeile %s"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:276
+#: plugins/gofon/macro/class_gofonMacro.inc:279
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr "Kann SELECT-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:285
-#: plugins/gofon/macro/class_gofonMacro.inc:293
+#: plugins/gofon/macro/class_gofonMacro.inc:288
+#: plugins/gofon/macro/class_gofonMacro.inc:296
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr "Kann DELETE-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:307
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr "Kann INSERT-Abfrage in Datenbank '%s' nicht ausführen"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:350
+#: plugins/gofon/macro/class_gofonMacro.inc:357
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:355
+#: plugins/gofon/macro/class_gofonMacro.inc:362
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:359
+#: plugins/gofon/macro/class_gofonMacro.inc:366
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Die angegebene cn ist zu lang. Die mögliche Länge ist auf 20 Zeichen "
 "begrenzt."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:364
+#: plugins/gofon/macro/class_gofonMacro.inc:371
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:370
+#: plugins/gofon/macro/class_gofonMacro.inc:377
 msgid "Makro length must be lower than 100 lines"
 msgstr "Das Makro darf nicht länger als 100 Zeilen sein"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:375
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
@@ -8669,30 +10552,30 @@ msgstr "Sichtbar f
 msgid "Macro text"
 msgstr "Makro-Inhalt"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:242
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
 msgstr "Zeichenkette"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:243
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Combobox"
 msgstr "Auswahl-Gruppe"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:244
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 msgid "Bool"
 msgstr "Schalter"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:250
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:332
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
@@ -8700,12 +10583,12 @@ msgstr ""
 "Der Parameter '%s' enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
 "verwendet"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:337
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr "Der Parameter %s besitzt einen ungültigen Wert für Datentyp bool."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:366
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -8768,27 +10651,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:560
 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:616
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
 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:636
 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:750
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -8796,12 +10679,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:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -8809,7 +10692,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:758
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -8817,19 +10700,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:771
 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:801
 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:887
 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:890
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
@@ -8838,35 +10721,44 @@ msgstr ""
 "sind erlaubt."
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
-msgid "Phone PIN must be 4 characters long."
-msgstr "Die Telefon-PIN muss 4 Zeichen lang sein."
+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:898
 msgid ""
-"The specified phone PIN contains invalid characters, only numeric values are "
-"allowed here."
+"The specified phone PIN contains invalid characters, only aphanumeric values "
+"are allowed here."
 msgstr ""
-"Das Feld 'PIN' enthält ungültige Zeichen. Nur numerische Werte sind erlaubt."
+"Das Feld 'PIN' enthält ungültige Zeichen. Nur alphanumerische Werte sind "
+"erlaubt."
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1077
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 msgid "Stop"
 msgstr "Beenden"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1083
+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:1116
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "Benutzer '%s' von Warteschlange '%s' entfernt."
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/paste_generic.tpl:28
 msgid "Voicemail PIN"
 msgstr "Voicemail-PIN"
 
 #: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/paste_generic.tpl:36
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
@@ -8875,11 +10767,8 @@ msgstr "Telefon-PIN"
 msgid "Phone macro"
 msgstr "Telefon-Makro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: plugins/gofon/phoneaccount/main.inc:121
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
@@ -8891,28 +10780,28 @@ msgstr "Telefon-Konferenzen"
 msgid "Management"
 msgstr "Verwaltung"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 msgid "Create new conference"
 msgstr "Neue Konferenz erstellen"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 msgid "New conference"
 msgstr "Neue Konferenz"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
 msgid "This table displays all available conference rooms."
 msgstr "Diese Tabelle enthält alle verfügbaren Konferenzräume."
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
 msgid "Name - Number"
 msgstr "Name - Nummer"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:317
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
 #: plugins/gofon/conference/generic.tpl:107
 msgid "PIN"
 msgstr "PIN"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:371
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
 msgid "Conference"
 msgstr "Konferenz"
 
@@ -8933,11 +10822,6 @@ msgstr "W
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Telefonnummer"
-
 #: plugins/gofon/conference/generic.tpl:99
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
@@ -8966,7 +10850,7 @@ msgstr "Benachrichtige 
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:193
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
@@ -8974,24 +10858,24 @@ msgstr ""
 "Sie haben eine Konferenz ohne PIN angelegt - bitte lassen Sie die PIN-Felder "
 "leer."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:197
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
 msgid "Please enter a PIN."
 msgstr "Bitte geben Sie eine PIN ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:201
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
 msgid "Please enter a name for the conference."
 msgstr "Bitte geben Sie einen Namen für die Konferenz ein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:205
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Der Wert für 'Nummer' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:209
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Der Wert für 'Lebenszeit' muss numerisch sein."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:349
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -9021,43 +10905,44 @@ msgstr "Regul
 msgid "Conference management"
 msgstr "Konferenz-Verwaltung"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
+#: plugins/gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Telefon-Berichte"
 
-#: plugins/gofon/reports/class_fonreport.inc:155
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
-"Die Telefon-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
 "angezeigt werden!"
 
-#: plugins/gofon/reports/class_fonreport.inc:159
+#: plugins/gofon/fonreports/class_fonreport.inc:110
 msgid "Can't select phone database for report generation!"
 msgstr ""
-"Die Telefon-Datenbank kann bezüglich der Berichterstellung nicht ausgewählt "
+"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
 "werden!"
 
-#: plugins/gofon/reports/class_fonreport.inc:168
+#: plugins/gofon/fonreports/class_fonreport.inc:212
 msgid "Query for phone database failed!"
 msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
 
-#: plugins/gofon/reports/contents.tpl:31
+#: plugins/gofon/fonreports/contents.tpl:31
 msgid "Source"
 msgstr "Quelle"
 
-#: plugins/gofon/reports/contents.tpl:32
+#: plugins/gofon/fonreports/contents.tpl:32
 msgid "Destination"
 msgstr "Ziel"
 
-#: plugins/gofon/reports/contents.tpl:33
+#: plugins/gofon/fonreports/contents.tpl:33
 msgid "Channel"
 msgstr "Kanal"
 
-#: plugins/gofon/reports/contents.tpl:36
+#: plugins/gofon/fonreports/contents.tpl:36
 msgid "Duration"
 msgstr "Dauer"
 
-#: plugins/gofon/reports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:5
 msgid "Phone reports"
 msgstr "Telefon-Berichte"
 
@@ -9104,83 +10989,7 @@ msgstr "Das GOsa Team"
 msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-"Warnung: Das Konto hat eine ungültige Mail-Server Adresse! Bitte überprüfen "
-"Sie die Einstellungen des Mail-Servers."
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Warnung: Der IMAP-Server kann nicht erreicht werden! Einige Mail-"
-"Einstellungen werden nicht auf den Server übertragen!"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-"Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
-
-#: include/class_mail-methods-cyrus.inc:155
-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
-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
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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_xmlParse.inc:42
-#, php-format
-msgid "Could not open XML input '%s'."
-msgstr "Kann die XML-Datei '%s' nicht öffnen."
-
-#: include/class_xmlParse.inc:116
-#, php-format
-msgid "XML error in %s : %s at line %d"
-msgstr "XML-Fehler in der Datei %s: %s in Zeile %d"
-
-#: include/class_plugin.inc:391
+#: include/class_plugin.inc:465
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -9188,7 +10997,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:419 include/class_password-methods.inc:181
+#: include/class_plugin.inc:493 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -9196,7 +11005,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:447
+#: include/class_plugin.inc:521
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -9296,26 +11105,36 @@ msgid "Support for phpgroupware enabled"
 msgstr "Unterstützung für PHPGroupware aktiviert"
 
 #: include/functions_setup.inc:221
+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
+msgid "Support for trustAccount enabled"
+msgstr "Unterstützung für Vertrauensstellungen aktiviert"
+
+#: include/functions_setup.inc:231
 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:226
+#: include/functions_setup.inc:236
 msgid "Support for gofon enabled"
 msgstr "Unterstützung für GOfon aktiviert"
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:241
 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:236
+#: include/functions_setup.inc:246
 msgid "Support for nagios enabled"
 msgstr "Unterstützung für Nagios aktiviert"
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:256
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -9323,31 +11142,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:253
+#: include/functions_setup.inc:263
 msgid "Support for Kolab enabled"
 msgstr "Unterstützung für Kolab aktiviert"
 
-#: include/functions_setup.inc:271
+#: include/functions_setup.inc:281
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:274
+#: include/functions_setup.inc:284
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: include/functions_setup.inc:276
+#: include/functions_setup.inc:286
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 msgid "PHP setup inspection"
 msgstr "Überprüfung des PHP-Setups"
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:304
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Prüfe auf eine PHP-Version (>=4.1.0)"
 
-#: include/functions_setup.inc:295
+#: include/functions_setup.inc:305
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -9356,11 +11175,11 @@ msgstr ""
 "Funktionen, die in früheren Versionen fehlerhaft oder gar nicht "
 "implementiert waren."
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:308
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Prüfe ob register_globals ausgeschaltet ist"
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:309
 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 "
@@ -9370,40 +11189,40 @@ msgstr ""
 "für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein. "
 "GOsa funktioniert mit beiden möglichen Einstellungen."
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:312
 msgid "Checking for ldap module"
 msgstr "Suche LDAP-Modul"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 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:306
+#: include/functions_setup.inc:316
 msgid "Checking for XML functions"
 msgstr "Prüfe auf XML-Funktionen"
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:317
 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:310
+#: include/functions_setup.inc:320
 msgid "Checking for gettext support"
 msgstr "Prüfe auf gettext-Erweiterung"
 
-#: include/functions_setup.inc:311
+#: include/functions_setup.inc:321
 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:314
+#: include/functions_setup.inc:324
 msgid "Checking for iconv support"
 msgstr "Prüfe auf iconv-Erweiterung"
 
-#: include/functions_setup.inc:315
+#: include/functions_setup.inc:325
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -9411,11 +11230,11 @@ msgstr ""
 "Dieses Modul wird von GOsa benutzt, um Informationen der samba-Erweiterung "
 "zu verarbeiten und wird daher benötigt."
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:328
 msgid "Checking for mhash module"
 msgstr "Suche mhash-Modul"
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:329
 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."
@@ -9423,11 +11242,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:322
+#: include/functions_setup.inc:332
 msgid "Checking for imap module"
 msgstr "Suche IMAP-Modul"
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:333
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -9435,11 +11254,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:326
+#: include/functions_setup.inc:336
 msgid "Checking for getacl in imap"
 msgstr "Prüfe auf getacl im IMAP-Modul"
 
-#: include/functions_setup.inc:327
+#: include/functions_setup.inc:337
 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 "
@@ -9450,20 +11269,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:330
+#: include/functions_setup.inc:340
 msgid "Checking for mysql module"
 msgstr "Suche MySQL-Modul"
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:341
 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:334
+#: include/functions_setup.inc:344
 msgid "Checking for cups module"
 msgstr "Suche CUPS-Modul"
 
-#: include/functions_setup.inc:335
+#: include/functions_setup.inc:345
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -9471,11 +11290,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:338
+#: include/functions_setup.inc:348
 msgid "Checking for kadm5 module"
 msgstr "Suche kadm5-Modul"
 
-#: include/functions_setup.inc:339
+#: include/functions_setup.inc:349
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -9483,27 +11302,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:342
+#: include/functions_setup.inc:352
 msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
-#: include/functions_setup.inc:343
+#: include/functions_setup.inc:353
 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:379
+#: include/functions_setup.inc:389
 msgid "PHP detailed function inspection"
 msgstr "Detaillierte Überprüfung der verwendeten PHP-Funktionen"
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:393
 #, php-format
 msgid "Checking for function %s"
 msgstr "Prüfe Funktion %s"
 
-#: include/functions_setup.inc:384
+#: include/functions_setup.inc:394
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -9512,37 +11331,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:395
+#: include/functions_setup.inc:405
 msgid "Checking for some additional programms"
 msgstr "Suche einige zusätzliche Programme"
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:414
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Suche nach ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 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:408
+#: include/functions_setup.inc:418
 msgid "Checking imagick module for PHP"
 msgstr "Prüfe auf imagick Erweiterung"
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:419
 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:416
+#: include/functions_setup.inc:426
 msgid "Checking for fping utility"
 msgstr "Suche fping-Programm"
 
-#: include/functions_setup.inc:417
+#: include/functions_setup.inc:427
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -9550,11 +11369,11 @@ msgstr ""
 "Fping wird benötigt, um den Status von Thin-Client basierenden Terminal zu "
 "überwachen."
 
-#: include/functions_setup.inc:432
+#: include/functions_setup.inc:442
 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:433
+#: include/functions_setup.inc:443
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -9562,11 +11381,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:446
+#: include/functions_setup.inc:456
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini Überprüfung -> session.auto_register"
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:457
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -9574,11 +11393,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:450
+#: include/functions_setup.inc:460
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini Überprüfung -> implicit_flush"
 
-#: include/functions_setup.inc:451
+#: include/functions_setup.inc:461
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -9586,11 +11405,11 @@ msgstr ""
 "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
 "diese auf 'off', um die Leistung zu erhöhen."
 
-#: include/functions_setup.inc:458
+#: include/functions_setup.inc:468
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini Überprüfung -> max_execution_time"
 
-#: include/functions_setup.inc:459
+#: include/functions_setup.inc:469
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -9598,11 +11417,11 @@ msgstr ""
 "Die Ausführungszeit sollte mindestens 30 Sekunden betragen, da einige "
 "Aktionen viel Zeit in Anspruch nehmen."
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:476
 msgid "php.ini check -> memory_limit"
 msgstr "php.ini Überprüfung -> memory_limit"
 
-#: include/functions_setup.inc:467
+#: include/functions_setup.inc:477
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -9611,11 +11430,11 @@ msgstr ""
 "unvorhersehbare Probleme verursachen! Bei größeren Installationen sollte "
 "dieser Wert noch erweitert werden."
 
-#: include/functions_setup.inc:471
+#: include/functions_setup.inc:481
 msgid "php.ini check -> expose_php"
 msgstr "php.ini Überprüfung -> expose_php"
 
-#: include/functions_setup.inc:472
+#: include/functions_setup.inc:482
 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."
@@ -9624,11 +11443,11 @@ msgstr ""
 "setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
 "laufenden Server senden."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini Überprüfung -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -9636,11 +11455,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:720
+#: include/functions_setup.inc:732
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Sie müssen einen LDAP-Server angeben um fortzufahren!"
 
-#: include/functions_setup.inc:729 include/functions_setup.inc:812
+#: include/functions_setup.inc:741 include/functions_setup.inc:824
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -9648,8 +11467,8 @@ msgstr ""
 "Kann den angegebenen LDAP-Server nicht erreichen! Bitte stellen Sie sicher, "
 "dass er für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:743 include/functions_setup.inc:817
-#: include/functions_setup.inc:822
+#: include/functions_setup.inc:755 include/functions_setup.inc:829
+#: include/functions_setup.inc:834
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -9657,15 +11476,15 @@ msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Bitte stellen Sie sicher, "
 "dass der Server für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:832
+#: include/functions_setup.inc:844
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
+"please check all information twice"
 msgstr ""
 "Die Verbindung zum Server war erfolgreich, dieser scheint jedoch leer zu "
 "sein. Bitte überprüfen Sie nochmals Ihre Angaben."
 
-#: include/functions_setup.inc:888
+#: include/functions_setup.inc:900
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -9674,7 +11493,7 @@ msgstr ""
 "Das Attribut '%s' ist in diesem Formular nicht angegeben. Bitte "
 "vervollständigen Sie Ihre Eingaben!"
 
-#: include/functions_setup.inc:919
+#: include/functions_setup.inc:931
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -9682,14 +11501,14 @@ msgstr ""
 "Kann von GOsa benötigte Schema-Informationen nicht lesen. Bitte stellen Sie "
 "sicher, dass diese lesbar sind."
 
-#: include/functions_setup.inc:928
+#: include/functions_setup.inc:940
 #, 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:1038 include/functions_setup.inc:1061
-#: include/functions_setup.inc:1070 html/index.php:172
+#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
+#: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -9722,24 +11541,24 @@ msgstr "Kann SHA nicht benutzen (fehlende Funktion mhash / sha1 / crypt)"
 msgid "XML error in guide.xml: %s at line %d"
 msgstr "XML-Fehler in der Datei guide.xml: %s in Zeile %d"
 
-#: include/functions_helpviewer.inc:83
+#: include/functions_helpviewer.inc:86
 msgid "No help available for this plugin."
 msgstr "Für dieses Modul ist keine Hilfe verfügbar."
 
-#: include/functions_helpviewer.inc:92
+#: include/functions_helpviewer.inc:95
 msgid "previous"
 msgstr "Vorherige"
 
-#: include/functions_helpviewer.inc:96
+#: include/functions_helpviewer.inc:99
 msgid "next"
 msgstr "Nächste"
 
-#: include/functions_helpviewer.inc:384
+#: include/functions_helpviewer.inc:387
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr "%s Ergebnisse für Ihre Suche nach %s (effektiv gesucht nach: %s)"
 
-#: include/functions_helpviewer.inc:459
+#: include/functions_helpviewer.inc:462
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
@@ -9838,7 +11657,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:316
+#: include/php_setup.inc:71 html/main.php:362
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -9862,40 +11681,40 @@ msgstr "statisch"
 msgid "method"
 msgstr "Methode"
 
-#: include/php_setup.inc:121
+#: include/php_setup.inc:129
 msgid "Trace"
 msgstr "Ablaufverfolgung"
 
-#: include/php_setup.inc:122
+#: include/php_setup.inc:130
 msgid "Line"
 msgstr "Zeile"
 
-#: include/php_setup.inc:123
+#: include/php_setup.inc:131
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/functions.inc:282
+#: include/functions.inc:292
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr "Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:303
+#: include/functions.inc:313
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Anmeldung des Nutzers ist fehlgeschlagen. Die Meldung lautet '%s'."
 
-#: include/functions.inc:322
+#: include/functions.inc:332
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr "Die Kennung ist nicht eindeutig. Bitte prüfen Sie die LDAP-Datenbank."
 
-#: include/functions.inc:360
+#: include/functions.inc:370
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 "Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
 
-#: include/functions.inc:370
+#: include/functions.inc:380
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -9905,20 +11724,20 @@ msgstr ""
 "überprüfen Sie den \"Config\" Eintrag in der Datei gosa.conf! Der LDAP-"
 "Server meldete '%s'."
 
-#: include/functions.inc:385
+#: include/functions.inc:395
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers lautet '%s'."
 
-#: include/functions.inc:411
+#: include/functions.inc:421
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann den Zugriffsschutz nicht entfernen. Die Meldung des LDAP-Servers lautet "
 "'%s'."
 
-#: include/functions.inc:441
+#: include/functions.inc:451
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -9926,7 +11745,7 @@ msgstr ""
 "Es kann nicht geprüft werden, ob das Objekt gesperrt ist. Die Parameter sind "
 "nicht korrekt!"
 
-#: include/functions.inc:451
+#: include/functions.inc:461
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -9934,7 +11753,7 @@ msgstr ""
 "Die Information über den Zugriffsschutz kann nicht aus der LDAP-Datenbank "
 "gelesen werden. Bitte prüfen Sie den \"Config\"-Eintrag in der gosa.conf!"
 
-#: include/functions.inc:459
+#: include/functions.inc:469
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -9942,12 +11761,12 @@ msgstr ""
 "Mehrere Sperrungen für ein Objekt gefunden. Dies sollte nicht möglich sein, "
 "bitte entfernen Sie mehrfache Referenzen."
 
-#: include/functions.inc:573
+#: include/functions.inc:583
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:575
+#: include/functions.inc:585
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -9956,11 +11775,16 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:592
+#: include/functions.inc:602
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:997
+#: include/functions.inc:1003
+#, php-format
+msgid "Last message repeated %s times."
+msgstr "Letzte Nachricht %s mal wiederholt."
+
+#: include/functions.inc:1069
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -9970,23 +11794,23 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1096
+#: include/functions.inc:1168
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1274
+#: include/functions.inc:1346
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1302
+#: include/functions.inc:1374
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1576
+#: include/functions.inc:1648
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1619
+#: include/functions.inc:1691
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -10018,17 +11842,35 @@ msgstr ""
 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:136
+#: include/class_config.inc:195 html/index.php:141
 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:433
+#: include/class_config.inc:450
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
-#: include/class_ldap.inc:437
+#: include/class_ldap.inc:405
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Erstelle Kopie von %s"
+
+#: include/class_ldap.inc:408
+msgid "Processing"
+msgstr "Verarbeite"
+
+#: include/class_ldap.inc:448
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
+
+#: include/class_ldap.inc:511
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "unbekannter FAI-Status %s"
+
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -10037,7 +11879,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:699
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -10046,22 +11888,112 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:712
+#: include/class_ldap.inc:907
 #, 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:728
+#: include/class_ldap.inc:923
 #, 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_debconfTemplate.inc:251
+#: include/class_debconfTemplate.inc:250
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
+#: include/class_mail-methods-cyrus.inc:39
+msgid ""
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
+msgstr ""
+"Warnung: Das Konto hat eine ungültige Mail-Server Adresse! Bitte überprüfen "
+"Sie die Einstellungen des Mail-Servers."
+
+#: include/class_mail-methods-cyrus.inc:52
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+"Warnung: Der IMAP-Server kann nicht erreicht werden! Einige Mail-"
+"Einstellungen werden nicht auf den Server übertragen!"
+
+#: include/class_mail-methods-cyrus.inc:115
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+"Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
+
+#: include/class_mail-methods-cyrus.inc:155
+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
+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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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_CopyPasteHandler.inc:172
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Sie kopieren gerade den Eintrag %s."
+
+#: 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."
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
@@ -10192,7 +12124,7 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/index.php:144
+#: html/index.php:154
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -10200,38 +12132,46 @@ msgstr ""
 "GOsa kann keine Informationen über die verfügbaren Schema-Definitionen "
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
-#: html/index.php:152
+#: html/index.php:162
 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:180
+#: html/index.php:189
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:182
+#: html/index.php:191
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:189
+#: html/index.php:198
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:227
+#: html/index.php:237 html/index.php:301
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:227
+#: html/index.php:237 html/index.php:301
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
-#: html/helpviewer.php:113
+#: html/index.php:243
+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/helpviewer.php:116
 msgid "There is no helpfile specified for this class."
 msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
 
-#: html/helpviewer.php:221
+#: html/helpviewer.php:226
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -10250,7 +12190,7 @@ msgstr "Die angegebene Datenbank kann nicht ausgew
 msgid "Database query failed!"
 msgstr "Die Datenbankabfrage ist fehlgeschlagen!"
 
-#: html/main.php:114
+#: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -10258,24 +12198,61 @@ msgstr ""
 "'Register globals' ist im PHP aktiviert. GOsa läßt keine Anmeldung zu, bis "
 "dies von einem Administrator behoben wurde."
 
-#: html/main.php:157
+#: html/main.php:194
 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:287
+#: html/main.php:334
 #, 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:316
+#: html/main.php:362
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"Generating this page caused the W3C          conformance checker to raise "
+"some errors!"
 msgstr ""
 "Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Kann Datei '%s' nicht lesen, überprüfen Sie die Rechte."
+
+#: html/get_attachment.php:47
+msgid ""
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
+msgstr ""
+"Kann nicht zur glpi-Datenbank verbinden, da die MySQL-Erweiterung in Ihrer "
+"PHP-Umgebung nicht verfügbar ist."
+
+#: html/get_attachment.php:55
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
+msgstr ""
+"Kann die angegebene Datenbank nicht erreiche, bitte überprüfen Sie Ihre glpi-"
+"Konfiguration."
+
+#: html/get_attachment.php:64
+msgid "Can't get specified attachment file, there is no entry with this id."
+msgstr ""
+"Kann die gewählte Anhangs-Datei nicht abrufen, es wurde kein Eintrag mit der "
+"angegebenen ID gefunden."
+
+#: html/get_attachment.php:69
+#, php-format
+msgid "Can't open file '%s'."
+msgstr "Kann Datei '%s' nicht öffnen."
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Ein Sitzungskonflikt wurde festgestellt"
@@ -10312,7 +12289,6 @@ msgid "Welcome to the GOsa setup!"
 msgstr "Willkommen bei der GOsa Einrichtung!"
 
 #: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -10355,15 +12331,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"
 
@@ -10422,7 +12398,7 @@ msgstr "Angemeldet:"
 msgid "Locking conflict detected"
 msgstr "Ein Zugriffskonflikt wurde festgestellt"
 
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+#: ihtml/themes/altlinux/islocked.tpl:9
 msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may delete the lockfile in this "
@@ -10671,6 +12647,24 @@ msgstr ""
 "während normale Nutzer dies nicht dürfen. Führen Sie diese Kommandos aus, um "
 "die obigen Voraussetzungen zu erfüllen:"
 
+#: ihtml/themes/default/setup_introduction.tpl:4
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic information for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+"Scheinbar rufen Sie GOsa zum ersten Mal auf, denn es wurde keine "
+"Konfiguration gefunden. Diese Einrichtung wird Sie dabei unterstützen, eine "
+"initiale, aber lauffähige Konfiguration zu erzeugen, indem es Sie durch drei "
+"grundlegende Schritte führt: Zunächst wird versucht, die PHP-Installation "
+"auf mögliche Fehler sowie benötigte Module zu untersuchen, dann wird die "
+"Verfügbarkeit einiger optionaler Werkzeuge geprüft und abschließend wird, "
+"nachdem Sie die grundlegenden LDAP-Einstellungen festgelegt haben, die LDAP-"
+"Verbindung konfiguriert."
+
 #: ihtml/themes/default/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
@@ -10695,25 +12689,168 @@ msgstr "GOsa Hilfe-Browser"
 msgid "Index"
 msgstr "Index"
 
+#: ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the <i>Edit anyway</i> button."
+msgstr ""
+"Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere "
+"Person offenbar während der Bearbeitung eines Eintrages einfach den "
+"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 "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
-"GOsa kann Fehler im PHP-Interpreter erzeugen (insbesondere bei Beta-"
-"Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
-"aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
+"GOsa kann Fehler im PHP-Interpreter erzeugen. In einigen Fällen ist es "
+"hilfreich, das 'error_reporting' zu aktivieren (dies kann jedoch ein "
+"Sicherheitsrisiko darstellen)."
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "Die Gültigkeit ihrer GOsa-Sitzung ist abgelaufen!"
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+"Die letzte in der Web-Applikation durchgeführte Aktion liegt einige Zeit in "
+"der Vergangenheit. Aus Sicherheitsgründen wurde die Sitzung geschlossen. Um "
+"mit der Administration fortzufahren, melden Sie sich bitte erneut an."
+
+#: ihtml/themes/default/logout.tpl:10
+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:18
+msgid "Operation complete"
+msgstr "Vorgang abgeschlossen"
+
+#~ 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"
+
+#~ msgid "Settings for host entry #%s"
+#~ msgstr "Einstellungen für Host-Eintrag #%s"
+
+#~ msgid ""
+#~ "The name '%s' can't be used as host entry, the name is already used in "
+#~ "this ldap tree."
+#~ msgstr ""
+#~ "Der Name '%s' kann nicht als Host-Eintrag verwendet werden, da dieser "
+#~ "Name bereits im LDAP-Baum verwendet wird."
+
+#~ msgid "Can't rename the server '%s' to '%s', the server contains this zone."
+#~ msgstr ""
+#~ "Kann den Server '%s' nicht in '%s' umbenennen, der Server enthält diese "
+#~ "Zone."
+
+#~ msgid ""
+#~ "Can't rename '%s' to '%s',the destination name contains invalid "
+#~ "characters."
+#~ msgstr ""
+#~ "Kann '%s' nicht in '%s' umbenennen: Der neue Name enthält ungültige "
+#~ "Zeichen."
+
+#~ msgid "DFS Shares"
+#~ msgstr "DFS-Freigaben"
+
+#~ msgid "No DFS entries found"
+#~ msgstr "Keine DFS-EintrÀge gefunden"
+
+#~ msgid "Go up one dfsshare"
+#~ msgstr "Eine DFS-Freigabe nach oben"
+
+#~ msgid "Go to dfs root"
+#~ msgstr "Gehe zur DFS-Basis"
+
+#~ msgid "Create new dfsshare"
+#~ msgstr "Neue DFS-Freigabe erstellen"
+
+#~ msgid "You have no premissions to create a dfs share."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, eine DFS-Freigabe innerhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#~ msgid "Dfs share already exists."
+#~ msgstr "Die angegebene DFS-Freigabe existiert bereits."
+
+#~ msgid "Required Field \"Name of dfs Share\" is not set."
+#~ msgstr "Das benötigte Feld 'Name der DFS-Freigabe' ist nicht ausgefÌllt."
+
+#~ msgid "Required Field \"Description\" is not set."
+#~ msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#~ msgid "First Name"
-#~ msgstr "Vorname"
+#~ msgid "Required Field \"Fileserver\" is not set."
+#~ msgstr "Das benötigte Feld 'Server' ist nicht ausgefÌllt."
 
-#~ msgid "Edit parameters"
-#~ msgstr "Parameter bearbeiten"
+#~ msgid "Required Field \"Share on fileserver\" is not set."
+#~ msgstr "Das benötigte Feld 'Freigabe' ist nicht ausgefÌllt."
 
-#~ msgid "Edit optional application parameters"
-#~ msgstr "Optionale Anwendungsparameter bearbeiten"
+#~ msgid "Required Field \"Location\" is not set."
+#~ msgstr "Das benötigte Feld 'Ort' ist nicht gesetzt."
 
+#, fuzzy
 #~ msgid ""
-#~ "The application named %s is no longer available and has been removed."
-#~ msgstr "Die Applikation mit dem Namen %s ist nicht mehr verfÃ\83Â\83Ã\82Â\83Ã\83Â\85Ã\82Â\92gbar und wurde aus der Liste entfernt."
+#~ "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 ""
+#~ "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."
+
+#, fuzzy
+#~ msgid "Display dfs shares matching"
+#~ msgstr "Zeige die Adressen, auf die das Folgende passt"
+
+#, fuzzy
+#~ msgid "Regular expression for matching dfs share names"
+#~ msgstr "RegulÀrer Ausdruck fÌr System-Namen"
+
+#~ msgid "DFS Properties"
+#~ msgstr "DFS-Eigenschaften"
+
+#, fuzzy
+#~ msgid "Name of dfs Share"
+#~ msgstr "Name der Abteilung"
+
+#, fuzzy
+#~ msgid "Fileserver"
+#~ msgstr "Mail-Server"
+
+#, fuzzy
+#~ msgid "Share on Fileserver"
+#~ msgstr "Parent-Server"
+
+#, fuzzy
+#~ msgid "DFS Location"
+#~ msgstr "Ort"
+
+#~ msgid "Distributed Filesystem Administration"
+#~ msgstr "DFS-Verwaltung"