Updated Translation Strings.

Added German Translation.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3164 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index 79284bdaaeeb695e32135a97865f5b1da9866ce6..c778e40f3d29c60f17ab8de858745148f7696966 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index d2868a0ef136d5bcaf6c642cef917e3468b9311d..40af2695a3d91ff01b54adab61b0c6ea8ae28a2f 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2006-04-24 14:45+0200\n"
+"PO-Revision-Date: 2006-04-28 14:02+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,19 +23,19 @@ msgstr ""
 msgid "My account"
 msgstr "Mein Konto"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: contrib/gosa.conf: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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -60,21 +60,21 @@ msgstr "Zus
 msgid "Generic"
 msgstr "Allgemein"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Umgebung"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -82,42 +82,47 @@ msgstr "Umgebung"
 msgid "Mail"
 msgstr "Mail"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: 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:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -126,29 +131,29 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Telefon"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf: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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Referenzen"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -156,30 +161,30 @@ msgstr "Zugriffsregeln"
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Start"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -199,29 +204,30 @@ msgstr "Drucker"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repository"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -230,11 +236,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -243,73 +249,73 @@ msgstr "Excel-Export"
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr "Pakete"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -346,7 +352,8 @@ msgstr "W
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filter"
 
@@ -413,6 +420,8 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -442,7 +451,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -463,7 +472,7 @@ msgstr "Hinzuf
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -472,21 +481,21 @@ msgstr "Hinzuf
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -539,7 +548,7 @@ msgstr "Prim
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -556,7 +565,7 @@ msgstr "Kontingent-Nutzung"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "nicht definiert"
 
@@ -599,6 +608,8 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -620,7 +631,7 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -731,12 +742,12 @@ msgstr "schaltet alle 
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -749,7 +760,7 @@ msgstr "schaltet alle 
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Speichern"
@@ -758,7 +769,8 @@ msgstr "Speichern"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -770,7 +782,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -785,7 +797,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -965,8 +976,8 @@ msgstr "Es wurde kein Ordner f
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -1047,10 +1058,11 @@ msgstr "Zur
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1071,7 +1083,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:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1080,7 +1092,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:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
@@ -1209,6 +1221,7 @@ msgstr "Zeige die Systeme der Abteilung"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
@@ -1233,7 +1246,7 @@ msgstr "unkonfiguriert"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automatisch"
@@ -1430,7 +1443,7 @@ msgstr "Dezember"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1466,12 +1479,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
@@ -1515,7 +1528,7 @@ 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:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
@@ -1837,7 +1850,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
@@ -1847,7 +1860,7 @@ msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
@@ -1990,21 +2003,22 @@ msgstr "Bevorzugte Sprache"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -2022,8 +2036,8 @@ msgstr "W
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2082,10 +2096,10 @@ msgstr "Organisation"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2128,7 +2142,7 @@ msgstr "Pager"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Ort"
 
@@ -2659,7 +2673,8 @@ msgid "Template user"
 msgstr "Benutzer-Vorlage"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr "Gesperrt"
 
@@ -2781,7 +2796,7 @@ msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2919,11 +2934,11 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 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:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -2931,21 +2946,21 @@ msgstr ""
 "Sie benötigen eine gültige UNIX-Erweiterung, um die Umgebungs-Erweiterung zu "
 "aktivieren."
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 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:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr "Fehler beim Speichern des Druckers"
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr "Fehler beim Speichern der Drucker-Einstellungen"
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 msgid "Admin"
 msgstr "Administrator"
 
@@ -2988,7 +3003,7 @@ msgstr "Skriptname"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3111,7 +3126,7 @@ msgstr "Durchsuchen"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 msgid "Close"
 msgstr "Schliessen"
 
@@ -3230,6 +3245,61 @@ msgstr ""
 msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr "Netatalk-Konto verwalten"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+msgid "This account has no netatalk extensions."
+msgstr "Dieses Konto hat keine Netatalk-Erweiterungen."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid "Remove netatalk account"
+msgstr "Netatalk-Konto entfernen"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat die Netatalk-Erweiterungen aktiviert. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
+msgstr "Neues Netatalk-Konto erzeugen"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat keine Netatalk-Erweiterungen. Sie können diese aktivieren, wenn "
+"Sie auf die untere Schaltfläche klicken."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr "Sie müssen eine zu verwendende Freigabe auswählen."
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr "Freigabe"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Pfad"
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Speichern"
+
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr "Netatalk-Einstellungen"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Liste der Sperrlisten"
@@ -3329,13 +3399,14 @@ msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3344,13 +3415,14 @@ msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3359,13 +3431,14 @@ msgid "Root"
 msgstr "Wurzel"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3374,14 +3447,15 @@ msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3392,12 +3466,13 @@ msgid "Up"
 msgstr "Auf"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3405,13 +3480,14 @@ msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3420,13 +3496,14 @@ msgid "Home"
 msgstr "Heimat"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3436,19 +3513,21 @@ msgstr "Liste neu laden"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3469,12 +3548,13 @@ msgid "New Blocklist"
 msgstr "Neue Sperrlisten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3483,56 +3563,61 @@ msgid "Submit department"
 msgstr "Aktualisieren"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "Bearbeiten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3540,8 +3625,8 @@ msgid "delete"
 msgstr "Entfernen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Delete user"
 msgstr "Benutzer entfernen"
@@ -3552,13 +3637,14 @@ msgstr "Name der Sperrliste"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3779,7 +3865,7 @@ msgstr "Sie versuchen, eine ung
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "zurück"
@@ -3855,7 +3941,7 @@ msgstr "Suchen"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4033,7 +4119,7 @@ msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Eintrag bearbeiten"
 
@@ -4819,66 +4905,66 @@ msgstr "Gruppenverwaltung"
 msgid "Groups"
 msgstr "Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, 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:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 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:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 msgid "Paste"
 msgstr "Einfügen"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 msgid "Can't paste"
 msgstr "Kann nicht einfügen"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 msgid "Create new group"
 msgstr "Neue Gruppe erstellen"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr "Kopieren"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4886,10 +4972,10 @@ msgstr "Diesen Eintrag kopieren"
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -4898,25 +4984,25 @@ msgstr "Diesen Eintrag bearbeiten"
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 msgid "Groupname"
 msgstr "Name der Gruppe"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4926,44 +5012,48 @@ msgstr "Name der Gruppe"
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: 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:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+msgid "! unknown id"
+msgstr "! unbekannte id"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -4971,27 +5061,23 @@ msgstr ""
 "Ihre Such-Methode ergab mehr als '%s' Benutzer, es werden davon '%s' "
 "Benutzer angezeigt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-msgid "! unknown id"
-msgstr "! unbekannte id"
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr "Keine konfigurierte SID für %s gefunden"
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr "Keine konfigurierte RIDBASE für '%s' gefunden."
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -4999,9 +5085,9 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
@@ -5027,7 +5113,7 @@ msgstr "Verf
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Objekt"
 
@@ -5157,6 +5243,7 @@ msgstr "W
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Wählen um Server anzuzeigen"
@@ -5195,15 +5282,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:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Anwendungen entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5211,11 +5298,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:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Anwendungen erstellen"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5223,71 +5310,71 @@ 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:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr "Die angegebene Kategorie enthält ungültige Zeichen."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr "Die angegebene Kategorie existiert bereits."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Der gewählte Anwendungsname ist nicht eindeutig. Bitte überprüfen Sie Ihr "
 "LDAP-Verzeichnis."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 msgid "application"
 msgstr "Anwendung"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Delete entry"
 msgstr "Eintrag entfernen"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr "Feldtrenner einfügen"
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "This application is no longer available."
 msgstr "Diese Applikation ist nicht mehr verfügbar."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr "Diese Applikation ist im Release '%s' nicht verfügbar."
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 msgid "Check parameter"
 msgstr "Überprüfe Parameter"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 msgid "This application has changed parameters."
 msgstr "Diese Applikation hat veränderte Parameter."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5391,55 +5478,55 @@ msgstr ""
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 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:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, 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:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 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:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 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:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5448,55 +5535,59 @@ msgstr "Passwort"
 msgid "Username"
 msgstr "Benutzername"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 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:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Edit netatalk properties"
+msgstr "Netatalk-Einstellungen bearbeiten"
+
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 msgid "Offline"
 msgstr "inaktiv"
 
@@ -5515,12 +5606,13 @@ msgstr ""
 "ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr "Vorlage"
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5574,7 +5666,7 @@ msgstr "Regul
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -5589,8 +5681,8 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5740,22 +5832,22 @@ msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "new"
 msgstr "Neu"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
@@ -6004,9 +6096,9 @@ msgstr "vorhanden"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
@@ -6051,27 +6143,27 @@ msgstr "Zeit-Dienst"
 msgid "LDAP Service"
 msgstr "LDAP-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Terminal-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr "Anmeldung sperren (temporär)"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr "Schrift-Suchpfad"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr "Protokoll-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr "Druck-Dienst"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Mail-Server"
 
@@ -6186,12 +6278,12 @@ msgstr ""
 "anzulegen."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -6201,131 +6293,136 @@ msgstr ""
 msgid "System management"
 msgstr "Systemverwaltung"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Terminal-Vorlage"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Terminal-Name"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modus"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Wählen Sie den Terminal-Modus"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr "Root-Server"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 "Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
 "werden sollen"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Protokoll-Server"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr "Zeit-Server-Attribute übernehmen"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "Zeit-Server"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 "Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Aktion"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "Standard"
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "zeige Auswahl"
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "direkt"
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "lastverteilt"
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "Citrix Metaframe"
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: 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:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: 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."
 
@@ -6343,7 +6440,7 @@ msgstr ""
 msgid "Server name"
 msgstr "Server-Name"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
@@ -6351,15 +6448,15 @@ msgstr "W
 msgid "Phone name"
 msgstr "Telefon-Name"
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
@@ -6413,27 +6510,27 @@ msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 msgid "Admins"
 msgstr "Administratoren"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "textuell"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6441,58 +6538,104 @@ msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Es ist kein REBOOTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr "Es muss mindestens ein NTP-Server ausgewählt sein, wenn der Übernahme-Modus nicht aktiv ist."
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+msgid "Activated"
+msgstr "Aktiv"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+msgid "Memory test"
+msgstr "Speichertest"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+msgid "System analysis"
+msgstr "Systemanalyse"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+msgid "Instant update"
+msgstr "Sofortiges Update"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Scheduled update"
+msgstr "Geplantes Update"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr "Neu-Installation"
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+msgid "Rescan hardware"
+msgstr "Hardware neu erkennen"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 msgid "The required field 'Server name' is not set."
 msgstr "Das benötigte Feld 'Server-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
@@ -6522,51 +6665,21 @@ msgstr ""
 "Aktuell besitzt dieser Server keine aktivierten DHCP-Funktionen. Sie können "
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Aktiv"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Speichertest"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Systemanalyse"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Sofortiges Update"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Geplantes Update"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Neu-Installation"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Hardware neu erkennen"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 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:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 
@@ -6574,175 +6687,199 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 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:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 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:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 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:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, 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:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation template"
 msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "System"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 msgid "Cups Server"
 msgstr "CUPS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 msgid "Fax Server"
 msgstr "Fax-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 msgid "Set root password"
 msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
@@ -6975,10 +7112,13 @@ msgstr ""
 "sein."
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Liste der Systeme"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
@@ -6988,58 +7128,71 @@ msgstr ""
 "hinzufügen, die bereits einmal im Netz gestartet wurden."
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Zeige Server"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr "Wählen, um Linux-Terminals zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Zeige Terminals"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr "Wählen, um Linux-Arbeitsstationen zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Zeige Arbeitsstationen"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Auswählen, um Microsoft Windows Arbeitsstationen zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Zeige Windows basierte Arbeitsstationen"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Zeige Netzwerk-Drucker"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Zeige Telefone"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr "Wählen, um Netzwerk-Geräte zu sehen"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr "Zeige Netzwerk-Geräte"
 
@@ -7048,6 +7201,7 @@ msgid "Regular expression for matching system names"
 msgstr "Regulärer Ausdruck zum Erkennen von System-Namen"
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Display systems of user"
 msgstr "Zeige Systeme des Benutzers"
 
@@ -7124,6 +7278,117 @@ msgstr "Frei/Belegt-Intervall mu
 msgid "No SMTP privileged networks set."
 msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr "Kann keine gültige Basis aus der Objekt-DN auslesen, setze Basis auf '%s'."
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr "Drucker-Erweiterung hinzufügen"
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+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:243
+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:274
+msgid "This 'dn' has no printer features."
+msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"Aktuell besitzt dieses Objekt keine aktivierte Drucker-Erweiterung. Sie "
+"können diese nicht aktivieren, solange das 'cn'-Attribut nicht im Eintrag "
+"enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
+"Vorlage."
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+msgid "Remove printer extension"
+msgstr "Drucker-Erweiterung entfernen"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+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:293
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+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:298
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+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:301
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+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:473
+#, 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:481
+msgid "can't get ppd informations."
+msgstr "keine PPD-Informationen verfügbar"
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, 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:496
+#, 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:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Gruppe"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7264,15 +7529,15 @@ msgstr "Freigabe bearbeiten"
 msgid "NFS setup"
 msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Pfad"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
+msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 msgid "Codepage"
 msgstr "Codepage"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 msgid "Option"
 msgstr "Option"
 
@@ -7374,38 +7639,38 @@ msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 "Die Datei '/etc/gosa/encodings' wurde nicht gefunden, kann die unterstützten "
 "Zeichensätze nicht einlesen."
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 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:126
+#: plugins/admin/systems/class_servNfs.inc:183
 msgid "Please specify a valid path for your setup."
 msgstr "Bitte geben Sie einen gültigen Pfad an."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a valid name for your setup."
 msgstr "Bitte geben Sie einen gültigen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 msgid "Please specify a name for your setup."
 msgstr "Bitte geben Sie einen Namen an."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 msgid "Description contains invalid characters."
 msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
@@ -7804,21 +8069,16 @@ msgid "Boot parameters"
 msgstr "Boot-Parameter"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-Server"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Boot-Kernel"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Angepasste Optionen"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
@@ -7827,6 +8087,11 @@ msgstr ""
 "Geben Sie die Parameter ein, die dem Kernel beim Starten übergeben werden "
 "sollen"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-Server"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 msgid "FAI server"
 msgstr "FAI-Server"
@@ -8081,7 +8346,6 @@ msgstr "Regul
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
@@ -8851,31 +9115,32 @@ msgstr "Zonen-Eintr
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 "DIes ist ein neues System, für das bisher noch kein Systemtyp definiert "
-"wurde. Bitte wählen Sie einen solchen Systemtyp für das gewählte System, der "
-"abhängige Dialog wird angezeigt, sobald Sie auf 'Speichern' klicken. Wenn "
-"das System zu einer Objektgruppe hinzugefügt werden soll, geben Sie den "
-"Namen der Objektgruppe an, das System wird automatisch hinzugefügt."
+"wurde. Bitte wählen Sie einen Systemtyp für dieses System und drücken auf 'Speichern' klicken. "
+"Wenn das System zu einer Gruppe von Systemeinstellungen hinzugefügt werden soll, "
+"geben Sie den Namen der Objektgruppe ein."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
-"Bitte wählen Sie einen Systemtyp (und wenn  gewünscht eine Objektgruppe)."
+"Bitte wählen Sie einen Systemtyp und (optional) einen Satz von vordefinierten Einstellungen (werden automatisch übernommen)."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
 msgid "Choose a system type"
 msgstr "Wählen Sie den System-Typ"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr "Mitglied in folgenden Objektgruppen"
+msgid "Inherit settings from this object group"
+msgstr "Einstellungen von dieser Objekt-Gruppe übernehmen"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Objektgruppe wählen"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -9046,111 +9311,14 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr "Um einen neuen Host-Eintrag hinzuzufügen, klicken Sie einfach hier"
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr "Drucker-Erweiterung hinzufügen"
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-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:237
-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:268
-msgid "This 'dn' has no printer features."
-msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
-
-#: plugins/admin/systems/class_printGeneric.inc:276
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"Aktuell besitzt dieses Objekt keine aktivierte Drucker-Erweiterung. Sie "
-"können diese nicht aktivieren, solange das 'cn'-Attribut nicht im Eintrag "
-"enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
-"Vorlage."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-msgid "Remove printer extension"
-msgstr "Drucker-Erweiterung entfernen"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-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:287
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-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:292
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-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:295
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-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:467
-#, 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:475
-msgid "can't get ppd informations."
-msgstr "keine PPD-Informationen verfügbar"
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, 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:490
-#, 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_divListSystem.inc:55
+#, fuzzy
+msgid "System / Department"
+msgstr "Abteilung"
 
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Gruppe"
+#: plugins/admin/systems/class_divListSystem.inc:169
+msgid "Set root       password"
+msgstr "root-Passwort setzen"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
@@ -9687,9 +9855,10 @@ msgstr "W
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Herunterladen"
@@ -10143,10 +10312,6 @@ msgstr "Variablen-Inhalt"
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr "Wählen Sie eine Vorlage zum Entfernen oder Bearbeiten"
-
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
 msgstr "Liste der Hook-Skripte"
@@ -11299,25 +11464,32 @@ msgstr "Kann das SIEVE-Skript nicht 
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr "Der LDAP-Server antwortet sehr langsam (%.2f), dies könnte die Ursache für Leistungseinbrüche sein."
+
+#: include/class_ldap.inc:446
 #, php-format
 msgid "Creating copy of %s"
 msgstr "Erstelle Kopie von %s"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr "Verarbeite"
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "unbekannter FAI-Status %s"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11326,7 +11498,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:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -11335,12 +11507,12 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, 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:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11355,7 +11527,7 @@ msgstr ""
 "Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -11363,7 +11535,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -11371,7 +11543,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -11654,7 +11826,17 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr "Unterstützung für Nagios aktiviert"
 
+#: include/functions_setup.inc:251
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"Die Unterstützung für Netatalk wurde deaktiviert, das passende Schema ist "
+"nicht installiert."
+
 #: include/functions_setup.inc:256
+msgid "Support for netatalk enabled"
+msgstr "Unterstützung für Netatalk aktiviert"
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11662,31 +11844,31 @@ msgstr ""
 "Die Unterstützung für Kolab wurde deaktiviert, das passende Schema ist nicht "
 "installiert. Setze Mail Methode auf cyrus."
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Unterstützung für Kolab aktiviert"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Überprüfung des PHP-Setups"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Prüfe auf eine PHP-Version (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11695,11 +11877,11 @@ msgstr ""
 "Funktionen, die in früheren Versionen fehlerhaft oder gar nicht "
 "implementiert waren."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Prüfe ob register_globals ausgeschaltet ist"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -11709,40 +11891,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:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Suche LDAP-Modul"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for XML functions"
 msgstr "Prüfe auf XML-Funktionen"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Prüfe auf gettext-Erweiterung"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "Gettext-Unterstützung wird für Übersetzungen benötigt (Anmerkung des "
 "Übersetzers: Da Sie diese Meldung in deutsch lesen können, ist davon "
 "auszugehen, daß ihr PHP gettext-fähig ist)."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Prüfe auf iconv-Erweiterung"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11750,11 +11932,11 @@ msgstr ""
 "Dieses Modul wird von GOsa benutzt, um Informationen der samba-Erweiterung "
 "zu verarbeiten und wird daher benötigt."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Suche mhash-Modul"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -11762,11 +11944,11 @@ msgstr ""
 "Bei der Verwendung von speziellen Passwort-Verschlüsselungen (wie z.B. SSHA) "
 "wird dieses Modul benötigt. GOsa funktioniert auch ohne dieses Modul."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Suche IMAP-Modul"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11774,11 +11956,11 @@ msgstr ""
 "Das IMAP-Modul wird für die Kommunikation mit ihrem IMAP-Server benötigt. "
 "Dort können Benutzer verwaltet und Statusinformationen bezogen werden."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Prüfe auf getacl im IMAP-Modul"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -11789,20 +11971,20 @@ msgstr ""
 "Zugriffsregeln nicht. Sie benötigen entweder ein angepasstes oder ein recht "
 "aktuelles PHP um diese Funktion nutzen zu können."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Suche MySQL-Modul"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Das MySQL-Modul wird benötigt, um Fax-Berichte anzuzeigen und auszuwerten."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Suche CUPS-Modul"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11810,11 +11992,11 @@ msgstr ""
 "Falls Sie eine Liste der verfügbaren Drucker über IPP auslesen möchten, "
 "benötigen Sie dieses Modul. Anderenfalls wird die printcap-Datei ausgewertet."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Suche kadm5-Modul"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11822,27 +12004,27 @@ msgstr ""
 "Um Benutzer auch im Kerberos verwalten zu können, muß das kadm5-Modul "
 "installiert sein. Sie können es über das PEAR-Netzwerk beziehen."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Simple Network Management Protocol (SNMP) wird zur Client-Überwachung "
 "benötigt."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 msgid "PHP detailed function inspection"
 msgstr "Detaillierte Überprüfung der verwendeten PHP-Funktionen"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, php-format
 msgid "Checking for function %s"
 msgstr "Prüfe Funktion %s"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11851,37 +12033,37 @@ msgstr ""
 "Die Funktion <b>%s</b> wird von GOsa verwendet. Es gibt derzeit noch keine "
 "Information, ob die Funktion optional ist oder zwingend benötigt wird."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Suche einige zusätzliche Programme"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Suche nach ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr "Prüfe auf imagick Erweiterung"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Suche fping-Programm"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11889,11 +12071,11 @@ msgstr ""
 "Fping wird benötigt, um den Status von Thin-Client basierenden Terminal zu "
 "überwachen."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Suche einen Weg, um LM/NT Passwort-Hashes zu generieren"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11901,11 +12083,11 @@ msgstr ""
 "Um Samba 2.x/3.x in Verbindung mit LDAP nutzen zu können, wird ein externes "
 "Programm benötigt, welches die Passwort-Hashes generieren kann."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini Überprüfung -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11913,11 +12095,11 @@ msgstr ""
 "Um GOsa fehlerfrei benutzen zu können, muß die Option session.auto_register "
 "in Ihrer php.ini auf 'off' stehen."
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini Überprüfung -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11925,11 +12107,11 @@ msgstr ""
 "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
 "diese auf 'off', um die Leistung zu erhöhen."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini Überprüfung -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11937,11 +12119,11 @@ msgstr ""
 "Die Ausführungszeit sollte mindestens 30 Sekunden betragen, da einige "
 "Aktionen viel Zeit in Anspruch nehmen."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "php.ini Überprüfung -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -11950,11 +12132,11 @@ msgstr ""
 "unvorhersehbare Probleme verursachen! Bei größeren Installationen sollte "
 "dieser Wert noch erweitert werden."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "php.ini Überprüfung -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -11963,11 +12145,11 @@ msgstr ""
 "setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
 "laufenden Server senden."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini Überprüfung -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11975,11 +12157,11 @@ msgstr ""
 "Erhöhen Sie die Sicherheit des Server, indem sie magic_quotes_gpc auf 'on' "
 "stellen. PHP wird in dieser Einstellung alle 'quotes' in 'strings' umwandeln."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Sie müssen einen LDAP-Server angeben um fortzufahren!"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -11987,8 +12169,8 @@ msgstr ""
 "Kann den angegebenen LDAP-Server nicht erreichen! Bitte stellen Sie sicher, "
 "dass er für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -11996,7 +12178,7 @@ msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Bitte stellen Sie sicher, "
 "dass der Server für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
@@ -12004,7 +12186,7 @@ msgstr ""
 "Die Verbindung zum Server war erfolgreich, dieser scheint jedoch leer zu "
 "sein. Bitte überprüfen Sie nochmals Ihre Angaben."
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12013,7 +12195,7 @@ msgstr ""
 "Das Attribut '%s' ist in diesem Formular nicht angegeben. Bitte "
 "vervollständigen Sie Ihre Eingaben!"
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -12021,14 +12203,14 @@ msgstr ""
 "Kann von GOsa benötigte Schema-Informationen nicht lesen. Bitte stellen Sie "
 "sicher, dass diese lesbar sind."
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -12095,7 +12277,7 @@ msgstr ""
 "enthält. Der Vorgang, Informationen über dieses Gerät zu beschaffen, wurde "
 "daher abgebrochen."
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Sie kopieren gerade den Eintrag %s."
@@ -12856,15 +13038,17 @@ msgstr ""
 msgid "Operation complete"
 msgstr "Vorgang abgeschlossen"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Speichern"
+#~ msgid "Membership in following objectGroups"
+#~ msgstr "Mitglied in folgenden Objektgruppen"
+
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Wählen Sie eine Vorlage zum Entfernen oder Bearbeiten"
 
 #~ msgid "Choose a script to delete or edit"
-#~ msgstr "WÃâ\82¬hlen Sie ein Skript zum Entfernen oder Bearbeiten"
+#~ msgstr "WÃÂ\83âÂ\82¬hlen Sie ein Skript zum Entfernen oder Bearbeiten"
 
 #~ msgid "Choose a hook to delete or edit"
-#~ msgstr "WÃâ\82¬hlen Sie einen Hook zum Entfernen oder Bearbeiten"
+#~ msgstr "WÃÂ\83âÂ\82¬hlen Sie einen Hook zum Entfernen oder Bearbeiten"
 
 #~ msgid "You have no permissions to create a printer on this 'Base'."
 #~ msgstr ""
@@ -12878,7 +13062,8 @@ msgstr "Speichern"
 #~ msgstr "DFS-Freigaben"
 
 #~ msgid "No DFS entries found"
-#~ msgstr "Keine DFS-EintrÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82¢Ã\83Â\82Ã\82Â\82Ã\83Â\82Ã\82¬ge gefunden"
+#~ msgstr ""
+#~ "Keine DFS-EintrÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82¢Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¬ge gefunden"
 
 #~ msgid "Go up one dfsshare"
 #~ msgstr "Eine DFS-Freigabe nach oben"
@@ -12899,37 +13084,42 @@ msgstr "Speichern"
 
 #~ msgid "Required Field \"Name of dfs Share\" is not set."
 #~ msgstr ""
-#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Name der DFS-Freigabe' ist nicht "
-#~ "ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\85Ã\83Â\82Ã\82Â\92llt."
+#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Name der DFS-"
+#~ "Freigabe' ist nicht ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\85Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\92llt."
 
 #~ msgid "Required Field \"Description\" is not set."
 #~ msgstr ""
-#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Beschreibung' ist nicht gesetzt."
+#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Beschreibung' ist "
+#~ "nicht gesetzt."
 
 #~ msgid "Required Field \"Fileserver\" is not set."
 #~ msgstr ""
-#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Server' ist nicht ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\85Ã\83Â\82Ã\82Â\92llt."
+#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Server' ist nicht "
+#~ "ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\85Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\92llt."
 
 #~ msgid "Required Field \"Share on fileserver\" is not set."
 #~ msgstr ""
-#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Freigabe' ist nicht ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\85Ã\83Â\82Ã\82Â\92llt."
+#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Freigabe' ist nicht "
+#~ "ausgefÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\85Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\92llt."
 
 #~ msgid "Required Field \"Location\" is not set."
-#~ msgstr "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Ort' ist nicht gesetzt."
+#~ msgstr ""
+#~ "Das benÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶tigte Feld 'Ort' ist nicht "
+#~ "gesetzt."
 
 #~ msgid ""
 #~ "This menu allows you to create, delete and edit selected dfs shares. "
 #~ "Having a large numbers of dfs shares, you might prefer the range "
 #~ "selectors on top of the dfs share list."
 #~ msgstr ""
-#~ "Dieses MenÃ\83Â\83Ã\82Â\83Ã\83Â\85Ã\82Â\92 ermÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82¶glicht es Ihnen, DFS-Freigaben hinzuzufÃ\83Â\83Ã\82Â\83Ã\83Â\85Ã\82Â\92gen, zu bearbeiten oder zu entfernen. Bei einer groÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\9fen Zahl von DFS-"
-#~ "Freigaben bietet sich die Verwendung der Bereichsauswahl an."
+#~ "Dieses MenÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\85Ã\83Â\82Ã\82Â\92 ermÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82¶glicht es Ihnen, DFS-Freigaben hinzuzufÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\85Ã\83Â\82Ã\82Â\92gen, zu bearbeiten oder zu entfernen. Bei einer groÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\9fen Zahl von "
+#~ "DFS-Freigaben bietet sich die Verwendung der Bereichsauswahl an."
 
 #~ msgid "Display dfs shares matching"
 #~ msgstr "Zeige die DFS-Freigaben, auf die Folgendes passt"
 
 #~ msgid "Regular expression for matching dfs share names"
-#~ msgstr "RegulÃ\83Â\83Ã\82Â\83Ã\83¢Ã\82\82¬rer Ausdruck zum Erkennen von DFS-Freigabenamen"
+#~ msgstr "RegulÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82¢Ã\83Â\82Ã\82Â\82Ã\83\82¬rer Ausdruck zum Erkennen von DFS-Freigabenamen"
 
 #~ msgid "DFS Properties"
 #~ msgstr "DFS-Eigenschaften"

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 0e8384e78ab9ea33991e2933df35b6cc45236d24..efcd2d87a7d58370b209b0807abfeee0e719f258 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -19,19 +19,19 @@ msgstr ""
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Agregados"
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -56,21 +56,21 @@ msgstr "Agregados"
 msgid "Generic"
 msgstr "Genérico"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Entorno"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -78,42 +78,47 @@ msgstr "Entorno"
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: 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:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -122,29 +127,29 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Teléfono"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Referencias"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -152,31 +157,31 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -196,30 +201,31 @@ msgstr "Impresora"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
 msgid "Repository"
 msgstr "Reintentar"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -228,12 +234,12 @@ msgstr ""
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 #, fuzzy
 msgid "Excel Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -242,16 +248,16 @@ msgstr "Exportar"
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 #, fuzzy
 msgid "Partitions"
 msgstr "Destino"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -259,62 +265,62 @@ msgstr "Destino"
 msgid "Script"
 msgstr "Ruta del Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 #, fuzzy
 msgid "Variables"
 msgstr "Variable"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Ruta del Perfil"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 #, fuzzy
 msgid "Packages"
 msgstr "Mostrar teléfonos"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italiano"
 
@@ -351,7 +357,8 @@ msgstr "Seleccione dirección para añadir"
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filtros"
 
@@ -418,6 +425,8 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -447,7 +456,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -468,7 +477,7 @@ msgstr "Añadir"
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -477,21 +486,21 @@ msgstr "Añadir"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -544,7 +553,7 @@ msgstr "Cuenta Principal"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -561,7 +570,7 @@ msgstr "Uso de la Cola de Correo"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "sin definirse"
 
@@ -604,6 +613,8 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -625,7 +636,7 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -735,12 +746,12 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -753,7 +764,7 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Guardar"
@@ -762,7 +773,8 @@ msgstr "Guardar"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -773,7 +785,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -788,7 +800,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
@@ -966,8 +977,8 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -1048,10 +1059,11 @@ msgstr "Atras"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1070,7 +1082,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1079,7 +1091,7 @@ msgstr ""
 "contraseña' no concuerdan."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -1208,6 +1220,7 @@ msgstr "Mostrar sistemas de departamentos"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
@@ -1232,7 +1245,7 @@ msgstr "Desconfigurado"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automático"
@@ -1432,7 +1445,7 @@ msgstr "Diciembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1468,12 +1481,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
@@ -1517,7 +1530,7 @@ msgstr ""
 "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
@@ -1832,7 +1845,7 @@ msgstr "No tiene permisos para transladar a un usuario de su base original"
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
@@ -1842,7 +1855,7 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
@@ -1991,21 +2004,22 @@ msgstr "Lenguaje por defecto"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -2023,8 +2037,8 @@ msgstr "Elija el subárbol donde colocar el usuario"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2084,10 +2098,10 @@ msgstr "Organización"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2130,7 +2144,7 @@ msgstr "Dispositivo de aviso"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Localización"
 
@@ -2673,7 +2687,8 @@ msgid "Template user"
 msgstr "Plantilla"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr ""
 
@@ -2809,7 +2824,7 @@ msgid "Hotplug device settings"
 msgstr "Disquetera"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2963,32 +2978,32 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 #, fuzzy
 msgid "Error while writing printer"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 #, fuzzy
 msgid "Error while writing printer settings"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 #, fuzzy
 msgid "Admin"
 msgstr "DN del administrador"
@@ -3040,7 +3055,7 @@ msgstr "Nombre de la lista"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3161,7 +3176,7 @@ msgstr "Visualizar"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 #, fuzzy
 msgid "Close"
 msgstr "Elige"
@@ -3304,6 +3319,69 @@ msgstr ""
 msgid "Nagios settings"
 msgstr "Parametros del correo de usuarios"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "Borrar"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Terminar"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Configuración de red"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Lista de listas de bloqueos"
@@ -3403,13 +3481,14 @@ msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3419,13 +3498,14 @@ msgid "Go to root department"
 msgstr "Lista de Departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3435,13 +3515,14 @@ msgid "Root"
 msgstr "Reiniciar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3451,14 +3532,15 @@ msgid "Go up one department"
 msgstr "Nombre del departamento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3469,12 +3551,13 @@ msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3483,13 +3566,14 @@ msgid "Go to users department"
 msgstr "Seleccione para ver los departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3499,13 +3583,14 @@ msgid "Home"
 msgstr "Nombre de Maquina"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3515,19 +3600,21 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3550,12 +3637,13 @@ msgid "New Blocklist"
 msgstr "Listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3565,28 +3653,31 @@ msgid "Submit department"
 msgstr "Mostrar departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 #, fuzzy
@@ -3594,8 +3685,8 @@ msgid "edit"
 msgstr "Editar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #, fuzzy
 msgid "Edit user"
@@ -3603,20 +3694,22 @@ msgstr "Usuario administrador"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3625,8 +3718,8 @@ msgid "delete"
 msgstr "Borrar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #, fuzzy
 msgid "Delete user"
@@ -3639,13 +3732,14 @@ msgstr "Gestión de listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3867,7 +3961,7 @@ msgstr "Esta intentando añadir un número de teléfono no valido."
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
@@ -3943,7 +4037,7 @@ msgstr "Buscar"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4122,7 +4216,7 @@ msgid "Add entry"
 msgstr "Añadir entrada"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Editar entrada"
 
@@ -4924,72 +5018,72 @@ msgstr "Administración de grupos"
 msgid "Groups"
 msgstr "Grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 #, fuzzy
 msgid "Paste"
 msgstr "Fecha"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 #, fuzzy
 msgid "Can't paste"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #, fuzzy
 msgid "Create new group"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "cut"
 msgstr "Ejecute"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4998,10 +5092,10 @@ msgstr "Editar entrada"
 msgid "Edit this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -5011,27 +5105,27 @@ msgstr "Editar entrada"
 msgid "Delete this entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 #, fuzzy
 msgid "Groupname"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -5041,70 +5135,70 @@ msgstr "Nombre del grupo"
 msgid "Properties"
 msgstr "Propiedades"
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
 "archivo de configuración!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+#, fuzzy
+msgid "! unknown id"
+msgstr "estado desconocido"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, fuzzy
-msgid "! unknown id"
-msgstr "estado desconocido"
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "No tiene permisos para crear un grupo en esta 'Base'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -5112,9 +5206,9 @@ msgstr ""
 "El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
 "numeros y guiones."
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
@@ -5143,7 +5237,7 @@ msgstr "Aplicaciones disponibles"
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Objeto"
 
@@ -5274,6 +5368,7 @@ msgstr "Seleccione usuarios que serán añadidos"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Seleccione para ver los servidores"
@@ -5313,15 +5408,15 @@ msgstr "Mostrar las direcciones de los departamentos"
 msgid "Display addresses matching"
 msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Borrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5329,11 +5424,11 @@ msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5341,80 +5436,80 @@ msgstr ""
 "Este grupo tiene la característica de aplicacióon desactivada. Puede "
 "activarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "El nombre seleccionado de aplicación no es único. Por favor compruebe su "
 "base de datos LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 #, fuzzy
 msgid "department"
 msgstr "departamentos"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 #, fuzzy
 msgid "application"
 msgstr "Aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 #, fuzzy
 msgid "Delete entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 #, fuzzy
 msgid "Move down"
 msgstr "Dominio"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 #, fuzzy
 msgid "This application is no longer available."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 #, fuzzy
 msgid "Check parameter"
 msgstr "Editar parametros"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 #, fuzzy
 msgid "This application has changed parameters."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5517,58 +5612,58 @@ msgstr ""
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5577,65 +5672,70 @@ msgstr "Contraseña"
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
@@ -5656,12 +5756,13 @@ msgstr ""
 "<b>ninguno</b> para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr "Plantilla"
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5717,7 +5818,7 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -5733,8 +5834,8 @@ msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5882,23 +5983,23 @@ msgstr "Ya existe una aplicación con este 'Nombre'."
 msgid "Application settings"
 msgstr "Opciones de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 #, fuzzy
 msgid "new"
 msgstr "Nuevo"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #, fuzzy
 msgid "Create new application"
 msgstr "Crear aplicaciones"
@@ -6148,9 +6249,9 @@ msgstr "presente"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
@@ -6195,27 +6296,27 @@ msgstr "Servicio de Hora"
 msgid "LDAP Service"
 msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
 msgid "Mail server"
 msgstr "Servidor"
@@ -6329,12 +6430,12 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "Ya hay una entrada '%s' en la base elegida"
@@ -6343,130 +6444,135 @@ msgstr "Ya hay una entrada '%s' en la base elegida"
 msgid "System management"
 msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Elija un subárbol donde colocar el terminal"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modo"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Seleccionar modo de terminal"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 "Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
 "intercambio"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "Servidor NTP"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr "Elija un servidor que será usado para sincronización horaria"
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Acción"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "por defecto"
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "mostrar elegidos"
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "Directo"
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "balanceo de carga"
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "Cliente ICA"
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr "Elija el teléfono localizado en el terminal actual"
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
@@ -6484,7 +6590,7 @@ msgstr ""
 msgid "Server name"
 msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
@@ -6492,15 +6598,15 @@ msgstr "Seleccione una acción que se ejecutara en este servidor"
 msgid "Phone name"
 msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Nombre de la estación de trabajo"
 
@@ -6562,27 +6668,27 @@ msgstr "¡No tiene permisos para eliminar esta entrada!"
 msgid "Admins"
 msgstr "DN del administrador"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "texto"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "Gráfico"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6590,57 +6696,109 @@ msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 msgid "Execution of '%s' failed!"
 msgstr "¡La ejecución de '%s' ha fallado!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Apagar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+#, fuzzy
+msgid "Activated"
+msgstr "Privado"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+#, fuzzy
+msgid "Memory test"
+msgstr "Memoria"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+#, fuzzy
+msgid "System analysis"
+msgstr "Registro del sistema"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+#, fuzzy
+msgid "Instant update"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+#, fuzzy
+msgid "Scheduled update"
+msgstr "Plantilla seleccionada"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+#, fuzzy
+msgid "Rescan hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 #, fuzzy
 msgid "The required field 'Server name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
@@ -6668,56 +6826,20 @@ msgstr ""
 "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-#, fuzzy
-msgid "Activated"
-msgstr "Privado"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-#, fuzzy
-msgid "Memory test"
-msgstr "Memoria"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-#, fuzzy
-msgid "System analysis"
-msgstr "Registro del sistema"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 #, fuzzy
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#, fuzzy
-msgid "Instant update"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-#, fuzzy
-msgid "Scheduled update"
-msgstr "Plantilla seleccionada"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Componente telefónico"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
@@ -6726,199 +6848,223 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal template"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 #, fuzzy
 msgid "New Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 #, fuzzy
 msgid "New Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 #, fuzzy
 msgid "New Phone"
 msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 #, fuzzy
 msgid "New Component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #, fuzzy
 msgid "Delete system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "System"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 #, fuzzy
 msgid "Cups Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 #, fuzzy
 msgid "Mail Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 #, fuzzy
 msgid "Imap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 #, fuzzy
 msgid "Fax Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
 msgid "Set root password"
 msgstr "Poner Contraseña"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 #, fuzzy
 msgid "New System from incoming"
 msgstr "Información de sistema"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminales"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 #, fuzzy
 msgid "Winstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 #, fuzzy
 msgid "Network Device"
 msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 #, fuzzy
 msgid "New Device"
 msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
@@ -7154,10 +7300,13 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Lista de sistemas"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
@@ -7166,58 +7315,71 @@ msgstr ""
 "específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Mostrar servidores"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr "Seleccione para ver los terminales Linux"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Mostrar terminales"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Mostrar estaciones de trabajo"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Mostrara estaciones de trabajo basadas en windows"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr "Seleccione para ver impresoras de red"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Mostrar impresoras de red"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr "Seleccione para ver teléfonos VOIP"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Mostrar teléfonos"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr "Seleccione para ver los dispositivos de red"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr "Mostrar dispositivos de Red"
 
@@ -7226,6 +7388,7 @@ msgid "Regular expression for matching system names"
 msgstr "Expresiones regulares para encontrar nombres de sistemas"
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 #, fuzzy
 msgid "Display systems of user"
 msgstr "Mostrar direcciones del usuario"
@@ -7306,6 +7469,119 @@ msgstr "Días futuros debe ser un valor"
 msgid "No SMTP privileged networks set."
 msgstr "No se han indicado redes privilegiadas SMTP."
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Eliminar extensión Kolab"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+#, fuzzy
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+#, fuzzy
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+#, fuzzy
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+#, fuzzy
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Información de sistema"
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Grupo"
+
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
 msgid ""
@@ -7455,16 +7731,16 @@ msgstr "Usuario administrador"
 msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 #, fuzzy
 msgid "Codepage"
 msgstr "Página Web Principal"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 #, fuzzy
 msgid "Option"
 msgstr "Opciones"
@@ -7575,42 +7851,42 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 #, fuzzy
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
 msgid "Please specify a valid name for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 #, fuzzy
 msgid "Please specify a name for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
@@ -8022,21 +8298,16 @@ msgid "Boot parameters"
 msgstr "Parametros de inicio"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "Servidor LDAP"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Kernel de inicio"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Otras opciones"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
@@ -8045,6 +8316,11 @@ msgstr ""
 "Introducir que parametros serán pasados a la configuración de arranque del "
 "nucleo"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "Servidor LDAP"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 #, fuzzy
 msgid "FAI server"
@@ -8310,7 +8586,6 @@ msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #, fuzzy
@@ -9134,13 +9409,15 @@ msgstr "Directorio"
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -9149,12 +9426,13 @@ msgid "Choose a system type"
 msgstr "Elija tipo de ratón"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Descripción del grupo"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Grupo de objetos"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -9312,113 +9590,15 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
-
-#: plugins/admin/systems/class_printGeneric.inc:276
-#, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-#, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-#, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:292
-#, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_divListSystem.inc:55
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
+msgid "System / Department"
+msgstr "Departamento"
 
-#: plugins/admin/systems/class_printGeneric.inc:475
+#: plugins/admin/systems/class_divListSystem.inc:169
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Información de sistema"
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Grupo"
+msgid "Set root       password"
+msgstr "Poner Contraseña"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
@@ -9976,9 +10156,10 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
 msgid "Download"
@@ -10488,11 +10669,6 @@ msgstr "Variable"
 msgid "List of template files"
 msgstr "Lista de Departamentos"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Elija un departamento para guardar la entrada"
-
 #: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
 msgid "List of hook scripts"
@@ -11682,26 +11858,33 @@ msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "s'"
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Lista de usuarios"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 #, fuzzy
 msgid "Error while fetching source dn - aborted!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "estado desconocido"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11710,7 +11893,7 @@ msgstr ""
 "Actualmente no esta soportada la creación automática del tipo '%s'. Por "
 "favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -11719,12 +11902,12 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11739,7 +11922,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -11747,7 +11930,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -11755,7 +11938,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -12040,7 +12223,19 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr "Soporte de GOFON activado"
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"El soporte para gofon se encuentra desactivado, no parece haber esquemas "
+"instalados"
+
 #: include/functions_setup.inc:256
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -12048,31 +12243,31 @@ msgstr ""
 "El soporte para Kolab se encuentra desactivado, no parece haber esquemas "
 "instalados, cambiando el método de correo a cyrus"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -12080,13 +12275,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 "Comprobando si el registro de variables globales (register_globals) esta "
 "desactivado."
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -12096,37 +12291,37 @@ msgstr ""
 "que permite acceder a variables globales sin cambiar el ambito. Esto puede "
 "ser un problema de seguridad. GOsa funcionará en los dos modos."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Este es el módulo más usado por GOsa, es realmente requerido."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "El soporte de gettext es requerido para la intenacionalización de GOsa."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -12135,11 +12330,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -12147,11 +12342,11 @@ msgstr ""
 "Necesitará este módulo para usar crifrado SSHA. Si usted solo usa crypt o "
 "md5, ignore este mensaje. GOsa correra si él."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -12159,11 +12354,11 @@ msgstr ""
 "El módulo de IMAP es necesario para comunicarse con el servidor IMAP. "
 "Obtiene el estado, crea y borra usuarios del correo."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -12173,21 +12368,21 @@ msgstr ""
 "módulo IAMP estandar no es capaz de leer acls. Necesitará una versión "
 "reciente de PHP para obtener está caracteristica. "
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "El soporte de MySQL es necesario para leer los repotes de GOfax de la base "
 "de datos."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -12195,11 +12390,11 @@ msgstr ""
 "Para poder leer las impresoras disponibles a través del protocolo IPP, en "
 "vez de los archivos printcap, tiene que tener instalado el módulo de CUPS."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -12207,27 +12402,27 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, fuzzy, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -12237,15 +12432,15 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -12253,11 +12448,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y el formato JPEG."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -12265,11 +12460,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y tengan formato JPEG."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -12277,11 +12472,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Buscando una manera de generar hashes de contraseñas LM/NT"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -12289,11 +12484,11 @@ msgstr ""
 "Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
 "para generar los hashes de contraseñas."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -12301,11 +12496,11 @@ msgstr ""
 "Para poder usar GOsa sin ningún problema la opción session.auto_register de "
 "su php.ini debe estar puesta en 'Off'."
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -12313,11 +12508,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -12325,11 +12520,11 @@ msgstr ""
 "El tiempo máximo de ejecución debe ser de al menos 30 segundos, algunas "
 "acciones pueden consumir mucho tiempo."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -12339,11 +12534,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -12352,11 +12547,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -12364,11 +12559,11 @@ msgstr ""
 "Aumenta la seguridad de su servidor poniendo 'magic_quotes_gpc' en 'on'. PHP "
 "escapara en este caso todas las comillas que encuentre en las cadenas."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -12376,8 +12571,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -12385,7 +12580,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 #, fuzzy
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
@@ -12394,7 +12589,7 @@ msgstr ""
 "Conexión al servidor correcta, pero el servidor aparenta estar completamente "
 "vacíos, por favor compruebe la información de nuevo."
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12402,19 +12597,19 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -12475,7 +12670,7 @@ msgid ""
 "getting dns informations for this device."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Has decidido eliminar la entrada %s"
@@ -13227,9 +13422,9 @@ msgstr ""
 msgid "Operation complete"
 msgstr "incompleto"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Terminar"
+#, fuzzy
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Elija un departamento para guardar la entrada"
 
 #~ msgid "You have no permissions to create a printer on this 'Base'."
 #~ msgstr "No tiene permisos para crear una impresora en esta 'Base'."
@@ -13411,9 +13606,6 @@ msgstr "Terminar"
 #~ msgid "DNS-Zone"
 #~ msgstr "ninguno"
 
-#~ msgid "Network settings"
-#~ msgstr "Configuración de red"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Elige"

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 7bc5cb094ca2773c31d88a3c96d105fa91a81a6d..b2bb39cb3d0a5b04b3cc6fb606053783f8cc086a 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -45,19 +45,19 @@ msgstr ""
 msgid "My account"
 msgstr "Mon Compte"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Extensions"
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -82,21 +82,21 @@ msgstr "Extensions"
 msgid "Generic"
 msgstr "Informations"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Environnement"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -104,42 +104,47 @@ msgstr "Environnement"
 msgid "Mail"
 msgstr "Messagerie"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Connectivité"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: 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:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -148,29 +153,29 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Téléphone"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf: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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Références"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Applications"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -178,30 +183,30 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Options"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr "Paramètres"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Démarrage"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Périphériques"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Imprimante"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -221,29 +226,30 @@ msgstr "Imprimante"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Base de données"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Dépôt"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -252,11 +258,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exporter"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr "Exporter en Excel"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -265,73 +271,73 @@ msgstr "Exporter en Excel"
 msgid "Import"
 msgstr "Importer"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "Importer un fichier CSV"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr "Partitions"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr "Connexions"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 msgid "Templates"
 msgstr "Modèles"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profils"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr "Paquets"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Allemand"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Russe"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Français"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Anglais"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italien"
 
@@ -368,7 +374,8 @@ msgstr "Sélectionner les adresses à ajouter"
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filtres"
 
@@ -435,6 +442,8 @@ msgstr "Utilisateur dont on montre les adresses"
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -464,7 +473,7 @@ msgstr "Utilisateur dont on montre les adresses"
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -485,7 +494,7 @@ msgstr "Ajouter"
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -494,21 +503,21 @@ msgstr "Ajouter"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -561,7 +570,7 @@ msgstr "Adresse principale"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -578,7 +587,7 @@ msgstr "Utilisation des Quota"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "non défini"
 
@@ -621,6 +630,8 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -642,7 +653,7 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -756,12 +767,12 @@ msgstr "désactive toutes les options de messagerie!"
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -774,7 +785,7 @@ msgstr "désactive toutes les options de messagerie!"
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Enregistrer"
@@ -783,7 +794,8 @@ msgstr "Enregistrer"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -795,7 +807,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -810,7 +822,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editer"
@@ -990,8 +1001,8 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -1072,10 +1083,11 @@ msgstr "Retour"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1096,7 +1108,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1105,7 +1117,7 @@ msgstr ""
 "champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
@@ -1235,6 +1247,7 @@ msgstr "Afficher les systèmes du département"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Afficher les systèmes correspondant"
 
@@ -1259,7 +1272,7 @@ msgstr "non configuré"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automatique"
@@ -1459,7 +1472,7 @@ msgstr "Décembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1495,12 +1508,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "La valeur de l''UID' spécifiée est trop petite."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "La valeur du 'GID' n'est pas valide."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "La valeur spécifiée comme 'GID' est trop petite."
 
@@ -1553,7 +1566,7 @@ msgstr ""
 "La valeur pour 'shadowMin' doit être inférieure à celle de 'shadowMax'."
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
@@ -1870,7 +1883,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
@@ -1880,7 +1893,7 @@ msgstr "Une personne ayant ce 'Identifiant' existe déjà dans l'annuaire."
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
 
@@ -2021,21 +2034,22 @@ msgstr "Langue préferée"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -2053,8 +2067,8 @@ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2113,10 +2127,10 @@ msgstr "Entreprise"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2159,7 +2173,7 @@ msgstr "Bip"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Lieu"
 
@@ -2695,7 +2709,8 @@ msgid "Template user"
 msgstr "Modèle d'utilisateur"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr "Verrouillé"
 
@@ -2821,7 +2836,7 @@ msgid "Hotplug device settings"
 msgstr "Paramètre des périphériques Hotplug"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2961,11 +2976,11 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "Veuillez indiquer un point de montage valide."
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 msgid "Please set a valid profile quota size."
 msgstr "Veuillez indiquer un quota valide pour le profil."
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -2973,23 +2988,23 @@ msgstr ""
 "Vous devez configurer correctement l'extension posix pour activer "
 "l'extension d'environnement."
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Impossible de sauver de nouveaux profiles kiosk, je n'ai pas les droits sur "
 "le répertoire"
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr "Une erreur s'est produite lors de la sauvegarde de l'imprimante"
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr ""
 "Une erreur s'est produite lors de la sauvegarde des paramètres de "
 "l'imprimante"
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -3032,7 +3047,7 @@ msgstr "Nom du script"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3152,7 +3167,7 @@ msgstr "Parcourir"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 msgid "Close"
 msgstr "Fermer"
 
@@ -3272,6 +3287,69 @@ msgstr ""
 msgid "Nagios settings"
 msgstr "Paramètres Nagios"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Créer un compte Intranet"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "Ce compte n'a pas d'extensions de messagerie."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Supprimer le compte de messagerie"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"L'extension de messagerie est activée pour ce compte, vous pouvez la "
+"désactiver en cliquant sur le bouton ci-dessous."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Créer un compte de messagerie"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"L'extension de messagerie est désactivée pour ce compte, vous pouvez "
+"l'activer en cliquant sur le bouton ci-dessous."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "Partages"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Chemin"
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Terminé"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Configuration réseau"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Liste des listes rouges"
@@ -3372,13 +3450,14 @@ msgid "Please specify a valid phone number."
 msgstr "Veuillez entrer un numéro de téléphone valide."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3387,13 +3466,14 @@ msgid "Go to root department"
 msgstr "Aller au département de base"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3402,13 +3482,14 @@ msgid "Root"
 msgstr "Racine"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3417,14 +3498,15 @@ msgid "Go up one department"
 msgstr "Monter d'un département"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3435,12 +3517,13 @@ msgid "Up"
 msgstr "Au dessus"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3448,13 +3531,14 @@ msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3463,13 +3547,14 @@ msgid "Home"
 msgstr "Acceuil"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3479,19 +3564,21 @@ msgstr "Recharger la liste"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3512,12 +3599,13 @@ msgid "New Blocklist"
 msgstr "Nouvelle liste rouge"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3526,56 +3614,61 @@ msgid "Submit department"
 msgstr "Soumettre le département"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "éditer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3583,8 +3676,8 @@ msgid "delete"
 msgstr "supprimer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
@@ -3595,13 +3688,14 @@ msgstr "Nom de la liste rouge"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3826,7 +3920,7 @@ msgstr "Vous essayez d'ajouter un numéro de téléphone invalide."
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "retour"
@@ -3902,7 +3996,7 @@ msgstr "Recherche"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4084,7 +4178,7 @@ msgid "Add entry"
 msgstr "Ajouter une entrée"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Modifier une entrée"
 
@@ -4878,66 +4972,66 @@ msgstr "Administration du groupe"
 msgid "Groups"
 msgstr "Groupes"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Vous êtes sur le point de supprimer le groupe '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce groupe!"
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 msgid "Paste"
 msgstr "Coller"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 msgid "Can't paste"
 msgstr "Impossible de coller"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 msgid "Create new group"
 msgstr "Créer un nouveau groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "cut"
 msgstr "couper"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr "copier"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4945,10 +5039,10 @@ msgstr "Copier cette entrée"
 msgid "Edit this entry"
 msgstr "Modifier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -4957,25 +5051,25 @@ msgstr "Modifier cette entrée"
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 msgid "Groupname"
 msgstr "Nom du groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4985,44 +5079,48 @@ msgstr "Nom du groupe"
 msgid "Properties"
 msgstr "Propriétés"
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr "Ce tableau montre tous les groupes, dans l'arbre sélectionné."
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
 "fichier de configuration!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr "Ce 'dn' n'est pas un groupe."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+msgid "! unknown id"
+msgstr "! identifiant inconnu"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -5030,26 +5128,22 @@ msgstr ""
 "'%s' utilisateurs ont été trouvé grâce à votre recherche, les '%s' premiers "
 "seront montrés."
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-msgid "! unknown id"
-msgstr "! identifiant inconnu"
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr "Pas de SID trouvé pour '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr "Pas de RIDBASE trouvé pour '%s'"
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -5057,9 +5151,9 @@ msgstr ""
 "Le champ 'Nom' contient des caractères invalides. Minuscule, chiffre et "
 "tirets sont valides."
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
 
@@ -5085,7 +5179,7 @@ msgstr "Applications disponibles"
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Objet"
 
@@ -5216,6 +5310,7 @@ msgstr "Sélectionnez les utilisateurs à ajouter"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Sélectionnez pour voir les serveurs"
@@ -5254,15 +5349,15 @@ msgstr "Afficher les adresses du département"
 msgid "Display addresses matching"
 msgstr "Afficher les adresses correspondantes"
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Ce 'dn' n'est pas un groupe d'applications."
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Suppression d'applications"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5270,11 +5365,11 @@ msgstr ""
 "Des applications sont configurées pour ce groupe. Vous pouvez les désactivez "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Créer des applications"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5282,70 +5377,70 @@ msgstr ""
 "Ce groupe ne possède pas d'applications configurées. Vous pouvez en ajouter "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr "Le nom de la catégorie contient des caractères invalides."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr "Le catégorie indiquée existe déjà."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "L'application sélectionnée n'a pas d'options."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 msgid "department"
 msgstr "département"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 msgid "application"
 msgstr "application"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Delete entry"
 msgstr "Supprimer cette entrée"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr "En haut"
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Move down"
 msgstr "En bas"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr "Insérer un séparateur"
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "This application is no longer available."
 msgstr "L'application sélectionnée n'est plus disponible."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr "Cette application n'est pas disponible dans la version nommée %s."
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 msgid "Check parameter"
 msgstr "Vérifier le paramètre"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 msgid "This application has changed parameters."
 msgstr "Cette application à changé de paramètres."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5451,55 +5546,55 @@ msgstr ""
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr ""
 "Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Vous êtes sur le point de supprimer l'utilisateur %s."
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Une personne ayant ce nom existe déjà dans l'annuaire."
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "Create new user"
 msgstr "Création d'un nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "Create new template"
 msgstr "Créer un nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5508,55 +5603,60 @@ msgstr "mot de passe"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr "Ce tableau montre toutes les utilisateurs, dans l'arbre sélectionné."
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 msgid "Edit UNIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Edit fax properies"
 msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Modifier les propriétés de messagerie"
+
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Create user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 msgid "Online"
 msgstr "En ligne"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 msgid "Offline"
 msgstr "Hors-ligne"
 
@@ -5575,12 +5675,13 @@ msgstr ""
 "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr "Modèle"
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5634,7 +5735,7 @@ msgstr "Expression régulière pour faire correspondre le nom des applications"
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Nom de l'application"
 
@@ -5649,8 +5750,8 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Le nom de l'application à afficher (ex: en dessous des icônes)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5803,22 +5904,22 @@ msgstr "Une application ayant le même 'Nom' existe déjà."
 msgid "Application settings"
 msgstr "Préférences des applications"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Vous êtes sur le point de supprimer l'application '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "new"
 msgstr "nouveau"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 msgid "Create new application"
 msgstr "Créer une nouvelle application"
 
@@ -6069,9 +6170,9 @@ msgstr "présent"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Ce 'dn' n'a pas d'extension de terminaux."
 
@@ -6113,27 +6214,27 @@ msgstr "Services de temps"
 msgid "LDAP Service"
 msgstr "Service LDAP"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Services de terminaux"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr "Désactiver temporairement le login"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr "Répertoire des polices de caractères"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr "Service de logs systèmes"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr "Services d'impression"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Serveur de messagerie"
 
@@ -6246,12 +6347,12 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
@@ -6260,121 +6361,126 @@ msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
 msgid "System management"
 msgstr "Administration du système"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Modèle de terminaux"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Nom du terminal"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Sélectionnez la branche où placer le terminal"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Mode"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Sélectionnez le mode du terminal"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Serveur de logs systèmes"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Sélectionnez le serveur de logs à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr "Serveur Primaire"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Sélectionnez le système de fichier root NFS à utiliser"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Serveur de Swap"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Serveur de logs systèmes"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Sélectionnez le serveur de logs à utiliser"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "Serveur NTP"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr "Sélectionnez le serveur pour la synchronisation du temps"
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Action"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr "Sélectionnez l'opération à exécuter sur le terminal"
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "défaut"
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "Afficher le sélecteur"
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "direct"
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "répartition de charge"
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "Client ICA"
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr "Choisissez le téléphone situé à coté du terminal"
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
@@ -6382,8 +6488,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
@@ -6403,7 +6509,7 @@ msgstr ""
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
@@ -6411,17 +6517,17 @@ msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 msgid "Phone name"
 msgstr "Nom du téléphone"
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 "Serveur de terminaux, le chemin vers les polices de caractère doit être "
 "spécifié."
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Modèle de station de travail"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
@@ -6475,27 +6581,27 @@ msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
 msgid "Admins"
 msgstr "Administrateurs"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "texte"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "graphique"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6503,56 +6609,103 @@ msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 msgid "Execution of '%s' failed!"
 msgstr "L'exécution de '%s' a échoué!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Aucune définition de REBOOTCMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Aucune définition de HALTCMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Eteindre"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un terminal dans cette 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr "Le champ obligatoire 'Nom du terminal' n'est pas renseigné."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+#, fuzzy
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr "Il doit y avoir au moins un numéro de queue définie."
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+msgid "Activated"
+msgstr "Activé"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+msgid "Memory test"
+msgstr "Test mémoire"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+msgid "System analysis"
+msgstr "Analyse du système"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr "Ce 'dn' n'a pas d'options serveur."
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+msgid "Instant update"
+msgstr "Mise à jour immédiate"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Scheduled update"
+msgstr "Mise à jour programmée"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr "Reinstaller"
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+msgid "Rescan hardware"
+msgstr "Recherche du matériel"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 msgid "The required field 'Server name' is not set."
 msgstr "Le champ obligatoire 'Nom du serveur' n'est pas rempli."
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation pour créer un serveur sur cette 'Base'."
 
@@ -6580,51 +6733,21 @@ msgstr ""
 "Ce serveur à l'option DHCP désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Activé"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Test mémoire"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Analyse du système"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Mise à jour immédiate"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Mise à jour programmée"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Reinstaller"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Recherche du matériel"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer une station de travail "
 "dans cette 'Base'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 "Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
@@ -6633,175 +6756,199 @@ msgstr ""
 msgid "Systems"
 msgstr "Systèmes"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr "Impossible d'éditer ce type d'objet pour le moment!"
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Le mot de passe entré dans le champ nouveau et celui dans le champ "
 "vérification ne concordent pas!"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr "Vous n'êtes pas autorisé à modifier ce mot de passe de ce système!"
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives aux "
 "composant '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr "Nouveau modèle de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation template"
 msgstr "Nouveau modèle de station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 msgid "New Server"
 msgstr "Nouveau Serveur"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 msgid "New Printer"
 msgstr "Nouvelle Imprimante"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Phone"
 msgstr "Nouveau Téléphone"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr "Nouveau composant"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 msgid "Edit system"
 msgstr "Editer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 msgid "Delete system"
 msgstr "Effacer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr "Ce tableau montre toutes les systèmes, dans l'arbre sélectionné."
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "System"
 msgstr "Système"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 msgid "Cups Server"
 msgstr "Serveur Cups"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr "Base de données de logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 msgid "Syslog Server"
 msgstr "Serveur de logs systèmes"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 msgid "Mail Server"
 msgstr "Serveur de messagerie"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 msgid "Imap Server"
 msgstr "Serveur Imap"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 msgid "Nfs Server"
 msgstr "Serveur NFS"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 msgid "Kerberos Server"
 msgstr "Serveur Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 msgid "Asterisk Server"
 msgstr "Serveur Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 msgid "Fax Server"
 msgstr "Serveur de Fax"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 msgid "Ldap Server"
 msgstr "Serveur Ldap"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 msgid "Set root password"
 msgstr "Indiquez le mot de passe administrateur"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "New System from incoming"
 msgstr "Nouveau système depuis l'arrivée"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 msgid "Winstation"
 msgstr "Stations Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 msgid "Network Device"
 msgstr "Périphérique réseau"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 msgid "New Device"
 msgstr "Nouveau périphérique"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 msgid "Terminal template for"
 msgstr "Modèle de terminal pour "
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
@@ -7036,10 +7183,13 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Liste des systèmes"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
@@ -7049,58 +7199,71 @@ msgstr ""
 "une fois."
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Afficher les serveurs"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr "Sélectionnez pour afficher les terminaux Linux"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Afficher les terminaux"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr "Sélectionnez pour voir les stations de travail Linux"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Afficher les stations de travail"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Afficher les stations de travail Windows"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr "Sélectionnez pour afficher les imprimantes réseaux"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Afficher les imprimantes réseaux"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr "Sélectionnez pour afficher les téléphones IP"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Afficher les téléphones"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr "Sélectionnez pour afficher les périphériques réseaux"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr "Montrer les périphériques réseau"
 
@@ -7109,6 +7272,7 @@ msgid "Regular expression for matching system names"
 msgstr "Expression régulière pour sélectionner les noms de systèmes"
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Display systems of user"
 msgstr "Afficher les systèmes de l'utilisateur"
 
@@ -7189,6 +7353,119 @@ msgstr "Le nombre de journées dans le futur doit être une valeur."
 msgid "No SMTP privileged networks set."
 msgstr "pas de réseaux SMTP privilégiés indiqués."
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr "Ajouter une extension d'imprimante"
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr "Ce 'dn' n'a pas d'extensions d'impression."
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"Ce serveur à l'extension d'imprimante désactivé. Vous ne pourrez l'activer "
+"tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
+"occupé à créer un nouveau modèle de terminal"
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+msgid "Remove printer extension"
+msgstr "Enlever l'extension d'impression"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
+"désactiver en cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+msgid "can't get ppd informations."
+msgstr "Impossible d'obtenir les informations sur le fichier ppd."
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+"Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
+"nom."
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+"Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
+"changer son nom."
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Groupes"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7329,15 +7606,15 @@ msgstr "Editer un partage"
 msgid "NFS setup"
 msgstr "Préférences NFS"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Chemin"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 msgid "Codepage"
 msgstr "Codage caractêres"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 msgid "Option"
 msgstr "Option"
 
@@ -7437,39 +7714,39 @@ msgstr "Le 'Nom du téléphone' '0' est réservé et ne peut pas être utilisé.
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 "Le fichier '/etc/gosa/encodings' n'existe pas, impossible d'obtenir la liste "
 "des jeux de caractères supportés."
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 "Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 msgid "Please specify a valid path for your setup."
 msgstr "Veuillez entrer un chemin valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a valid name for your setup."
 msgstr "Veuillez spécifier un nom valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 msgid "Please specify a name for your setup."
 msgstr "Veuillez spécifier un nom valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 msgid "Description contains invalid characters."
 msgstr "La description contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr "Le chemin contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr "L'option contient des caractères invalides."
 
@@ -7867,27 +8144,27 @@ msgid "Boot parameters"
 msgstr "Paramètre de démarrage"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "Serveur LDAP"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Kernel utilisé au démarrage"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Options personnalisées"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr "Entrez les paramètres qui seront passés au kernel lors du démarrage"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "Serveur LDAP"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 msgid "FAI server"
 msgstr "Serveur FAI"
@@ -8140,7 +8417,6 @@ msgstr "Expression régulière concordant avec les noms des périphériques"
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
@@ -8903,11 +9179,12 @@ msgid "Zone records"
 msgstr "Enregistrement de zone"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
+#, fuzzy
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 "Ceci est un nouveau système qui n'as pas encore de type défini. Veuillez "
 "choisir un type de système pour cette entrée, le page de configuration "
@@ -8916,7 +9193,10 @@ msgstr ""
 "ajouté automatiquement."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+#, fuzzy
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 "Veuillez sélectionner un type de système et si vous le voulez in groupe "
 "d'objet aussi."
@@ -8926,11 +9206,13 @@ msgid "Choose a system type"
 msgstr "Sélectionnez un type de système"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr "Membres des objectGroups suivants"
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Description du groupe"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+#, fuzzy
+msgid "Choose an object group"
 msgstr "Choisissez un groupe d'objets"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -9096,113 +9378,15 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr "Pour ajouter un nouvel hôte veuillez cliquer ici"
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr "Ajouter une extension d'imprimante"
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
-
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr "Ce 'dn' n'a pas d'extensions d'impression."
-
-#: plugins/admin/systems/class_printGeneric.inc:276
+#: plugins/admin/systems/class_divListSystem.inc:55
 #, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous ne pourrez l'activer "
-"tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
-"occupé à créer un nouveau modèle de terminal"
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-msgid "Remove printer extension"
-msgstr "Enlever l'extension d'impression"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
-"désactiver en cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_printGeneric.inc:292
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_printGeneric.inc:295
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
-
-#: plugins/admin/systems/class_printGeneric.inc:475
-msgid "can't get ppd informations."
-msgstr "Impossible d'obtenir les informations sur le fichier ppd."
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-"Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
-"nom."
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-"Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
-"changer son nom."
+msgid "System / Department"
+msgstr "Département"
 
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Groupes"
+#: plugins/admin/systems/class_divListSystem.inc:169
+#, fuzzy
+msgid "Set root       password"
+msgstr "Indiquez le mot de passe administrateur"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
@@ -9740,9 +9924,10 @@ msgstr "Choisissez une variable à effacer ou éditer"
 msgid "Fully Automatic Installation"
 msgstr "Installation entièrement automatique (FAI)"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Téléchargement"
@@ -10195,10 +10380,6 @@ msgstr "Contenu de la variable"
 msgid "List of template files"
 msgstr "Liste des modèles"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr "Choisissez le modèle à effacer où éditer"
-
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
 msgstr "Liste des scripts de connexions"
@@ -11355,25 +11536,32 @@ msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 "Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, php-format
 msgid "Creating copy of %s"
 msgstr "Création d'un copie de %s"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr "Traitement en cours"
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 msgid "Error while fetching source dn - aborted!"
 msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt!"
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Statut FAI inconnu %s"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11382,7 +11570,7 @@ msgstr ""
 "La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
 "rapport à l'équipe de GOsa."
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -11391,12 +11579,12 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11410,7 +11598,7 @@ msgid ""
 msgstr ""
 "La commande '%s', utilisée dans le CHECK de l'extension '%s' n'existe pas."
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -11418,7 +11606,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -11426,7 +11614,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -11697,7 +11885,19 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr "Le support de nagios activé"
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"Le support de l'extension nagios est désactivé, aucun schéma ne semble "
+"installé"
+
 #: include/functions_setup.inc:256
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Le support de nagios activé"
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11705,31 +11905,31 @@ msgstr ""
 "Le support de Kolab est désactivé, aucun schéma ne semble installé, la "
 "méthode de connexion au serveur de messagerie sera cyrus"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Le support de Kolab est activé"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Echec"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Vérification de l'installation de PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Vérification de la version de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11737,11 +11937,11 @@ msgstr ""
 "PHP doit être en version supérieur à 4.1.0 ou supérieur à cause de certaines "
 "fonctions et bogues connus dans le langage PHP."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Vérification de l'option register_globals, elle doit être à 'off'"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -11752,38 +11952,38 @@ msgstr ""
 "variables. Cela peut constituer un risque de sécurité. GOsa s'exécutera dans "
 "les deux modes."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Vérification du module LDAP"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "Ce module est le module de base utilisé par GOsa et est donc indispensable."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for XML functions"
 msgstr "Vérification du support XML"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "Les fonctionnalités XML sont nécessaires pour lire le fichier de "
 "configuration."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Vérification du support gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Gettext est requis afin que GOsa soit localisé."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Vérification du support iconv"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11791,11 +11991,11 @@ msgstr ""
 "Ce module est utilisé par GOsa pour convertir les options samba munged dial, "
 "il est indispensable."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Vérification du module mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -11804,11 +12004,11 @@ msgstr ""
 "seulement les mécanismes crypt ou md5, vous pouvez ignorer ce message. GOsa "
 "marchera sans celui ci."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Vérification du module imap"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11817,11 +12017,11 @@ msgstr ""
 "permet de récupérer des informations de statuts, créer et supprimer les "
 "comptes de messagerie des utilisateurs."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Vérification de la fonction getacl dans imap"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -11832,21 +12032,21 @@ msgstr ""
 "Vous devez installer une version récente de PHP afin d'utiliser cette "
 "fonctionnalité."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Vérification du module pour mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Le support de MySQL est nécessaire pour lire  les rapports GOfax en "
 "provenance d'une base de données."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Vérification du module cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11854,11 +12054,11 @@ msgstr ""
 "Afin d'obtenir la liste des imprimantes disponibles avec le protocole IPP à "
 "la place des fichiers printcap, vous devez installer le module CUPS."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Vérification du module kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11866,25 +12066,25 @@ msgstr ""
 "Gérer les utilisateurs dans kerberos nécessite le module kadm5 "
 "téléchargeable sur les réseaux PEAR."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 msgid "Checking for snmp Module"
 msgstr "Vérification du module snmp"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr "Le protocole SNMP est nécessaire pour pouvoir surveiller les clients."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 msgid "PHP detailed function inspection"
 msgstr "Vérification détaillée de l'installation de PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, php-format
 msgid "Checking for function %s"
 msgstr "Vérification de la fonction %s"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11893,15 +12093,15 @@ msgstr ""
 "La fonction %s est utilisée par GOsa. Il n'y a pas encore d'information si "
 "celle si est optionnelle ou indispensable."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Vérification de programmes additionnels"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Vérification de ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11909,11 +12109,11 @@ msgstr ""
 "ImageMagick est utilisé afin de redimensionner et convertir en JPEG les "
 "images, permettant ainsi leur utilisation dans GOsa."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr "Vérification du module imagick pour PHP"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -11921,11 +12121,11 @@ msgstr ""
 "ImageMagick est utilisé afin de redimensionner et convertir en JPEG les "
 "images, permettant ainsi leur utilisation dans GOsa."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Vérification de l'utilitaire fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11933,12 +12133,12 @@ msgstr ""
 "L'utilitaire fping est utilisé dans le cas d'un environnement composé de "
 "clients légers fonctionnant en terminaux."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 "Vérification de la possibilité de générer des mots de passe au format LM/NT"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11946,11 +12146,11 @@ msgstr ""
 "Afin d'utiliser Samba 2/3, vous devez installer des paquets additionnels "
 "prenant en charge le cryptage des mots de passe."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "Vérification de PHP.ini -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11958,11 +12158,11 @@ msgstr ""
 "Pour pouvoir utiliser GOSa sans problèmes, la variable session.auto_register "
 "doit être a 'Off' dans votre php.ini."
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "Vérification de PHP.ini -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11970,11 +12170,11 @@ msgstr ""
 "Cette option défini la gestion des sorties, mettez cette option a off pour "
 "améliorer la performance."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "Vérification de votre PHP.ini pour la variable max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11982,11 +12182,11 @@ msgstr ""
 "Le temps d'exécution doit être au moins de 30 secondes minimum, parce que "
 "certaines actions vont prendre plus de temps."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "Vérification de PHP.ini -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -11995,11 +12195,11 @@ msgstr ""
 "imprévisibles, voire sans message d'erreurs! Augmentez la mémoire pour les "
 "installations plus complexes."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "Vérification de PHP.ini - > expose.php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -12007,11 +12207,11 @@ msgstr ""
 "PHP n'enverra pas d'information a propos du serveur qui fait tourner "
 "l'application, ceci peut être considérer comme une mesure de sécurité."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "Vérification de PHP ini > magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -12019,11 +12219,11 @@ msgstr ""
 "Améliorez la sécurité de votre serveur en mettant magic_quotes_gpc à 'on'. "
 "PHP préfixera tout les guillemets dans les chaînes avec la séquence escape."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Vous devez spécifier un serveur LDAP afin de pouvoir continuer!"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -12031,8 +12231,8 @@ msgstr ""
 "Impossible de se connecter au serveur LDAP! Vérifiez que GOsa puisse le "
 "contacter."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -12040,7 +12240,7 @@ msgstr ""
 "Impossible de s'identifier sur l'annuaire LDAP! Veuillez vérifiez que GOsa "
 "puisse le contacter."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
@@ -12048,7 +12248,7 @@ msgstr ""
 "Connexion au serveur réussie, mais le serveur semble complètement vide, "
 "veuillez vérifier toutes informations un seconde fois"
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12057,7 +12257,7 @@ msgstr ""
 "L'attribut obligatoire '%s' n'existe pas pour ce formulaire. Veuillez le "
 "compléter!"
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -12066,13 +12266,13 @@ msgstr ""
 "configuration des vos schémas. Veuillez vérifier qu'elles sont lisibles par "
 "GOsa"
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Impossible de se connecter au serveur LDAP. Le serveur répond '%s'."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -12138,7 +12338,7 @@ msgstr ""
 "Il existe plus d'une zone dns qui contient une entrée nomée '%s'. Arrêt de "
 "l'obtention des informations dns pour ce périphérique."
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Vous êtes sur le point de copier l'entrée %s."
@@ -12892,9 +13092,11 @@ msgstr ""
 msgid "Operation complete"
 msgstr "Opération réalisée"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Terminé"
+#~ msgid "Membership in following objectGroups"
+#~ msgstr "Membres des objectGroups suivants"
+
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Choisissez le modèle à effacer où éditer"
 
 #~ msgid "Choose a script to delete or edit"
 #~ msgstr "Choisissez un script à effacer ou éditer"

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 05e97e78c52d283ba4b76336956173cd087abc4f..51bc770a4b257c2b3b6a240d1d2ec43a4d9832c1 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -19,19 +19,19 @@ msgstr ""
 msgid "My account"
 msgstr "Identità"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Extra"
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -56,21 +56,21 @@ msgstr "Extra"
 msgid "Generic"
 msgstr "Generale"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Ambiente"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -78,42 +78,47 @@ msgstr "Ambiente"
 msgid "Mail"
 msgstr "Posta"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Connettività"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: 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:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -122,29 +127,29 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Telefono"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf: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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Riferimenti"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -152,30 +157,30 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opzioni"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr "Parametro"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Avvio"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Stampante"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -195,30 +200,31 @@ msgstr "Stampante"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Informazioni"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Database"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servizi"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
 msgid "Repository"
 msgstr "Riprova"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -227,11 +233,11 @@ msgstr ""
 msgid "Export"
 msgstr "Esporta"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr "Esporta in formato Excel"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -240,73 +246,73 @@ msgstr "Esporta in formato Excel"
 msgid "Import"
 msgstr "Importa"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "Importa da CSV"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr "Partizioni"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 msgid "Variables"
 msgstr "Variabili"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 msgid "Templates"
 msgstr "Template"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profili"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Russo"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Francese"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Inglese"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italiano"
 
@@ -343,7 +349,8 @@ msgstr "Seleziona gli indirizzi da aggiungere"
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filtri"
 
@@ -410,6 +417,8 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -439,7 +448,7 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -460,7 +469,7 @@ msgstr "Aggiungi"
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -469,21 +478,21 @@ msgstr "Aggiungi"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -536,7 +545,7 @@ msgstr "Indirizzo principale"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -553,7 +562,7 @@ msgstr "Utilizzo quota"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "non definito"
 
@@ -596,6 +605,8 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -617,7 +628,7 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -725,12 +736,12 @@ msgstr "disabilita tutte le opzioni di posta!"
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -743,7 +754,7 @@ msgstr "disabilita tutte le opzioni di posta!"
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Salva"
@@ -752,7 +763,8 @@ msgstr "Salva"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -764,7 +776,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -779,7 +791,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Modifica"
@@ -946,8 +957,8 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Cambia la password"
 
@@ -1028,10 +1039,11 @@ msgstr "Indietro"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1050,14 +1062,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Le password nuova e ripetuta non corrispondono"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
@@ -1185,6 +1197,7 @@ msgstr "Mostra i sistemi del dipartimento"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Mostra i sistemi che corrispondono a:"
 
@@ -1209,7 +1222,7 @@ msgstr "non configurata"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automatico"
@@ -1404,7 +1417,7 @@ msgstr "Dicembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1439,12 +1452,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "Il valore specificato per l'UID è troppo basso."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "Il valore specificato per il GID non è valido."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "Il valore specificato per il GID è troppo basso."
 
@@ -1485,7 +1498,7 @@ msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
@@ -1785,7 +1798,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -1795,7 +1808,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -1937,21 +1950,22 @@ msgstr "Lingua preferita"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -1969,8 +1983,8 @@ msgstr "Scegli il subtree per l'utente"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2030,10 +2044,10 @@ msgstr "Organizzazione"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2076,7 +2090,7 @@ msgstr "Pager"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Località"
 
@@ -2603,7 +2617,8 @@ msgid "Template user"
 msgstr "Template"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr ""
 
@@ -2738,7 +2753,7 @@ msgid "Hotplug device settings"
 msgstr "Dispositivi del client"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2884,30 +2899,30 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 #, fuzzy
 msgid "Admin"
 msgstr "DN dell'amministratore"
@@ -2959,7 +2974,7 @@ msgstr "Script path"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3080,7 +3095,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 #, fuzzy
 msgid "Close"
 msgstr "Scegli"
@@ -3215,6 +3230,65 @@ msgstr ""
 msgid "Nagios settings"
 msgstr "Opzioni di posta dell'identità"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "Questa identità non ha le estensioni per la posta"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Rimuovi le estensioni di posta"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Crea estensioni di posta"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "reset"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Esegui"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Mostra workstation"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Lista delle liste di blocchi"
@@ -3311,13 +3385,14 @@ msgid "Please specify a valid phone number."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3326,13 +3401,14 @@ msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3341,13 +3417,14 @@ msgid "Root"
 msgstr "Root"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3356,14 +3433,15 @@ msgid "Go up one department"
 msgstr "Sali di dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3374,12 +3452,13 @@ msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3387,13 +3466,14 @@ msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3402,13 +3482,14 @@ msgid "Home"
 msgstr "Home"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3418,19 +3499,21 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3453,12 +3536,13 @@ msgid "New Blocklist"
 msgstr "Liste di blocco"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3467,36 +3551,39 @@ msgid "Submit department"
 msgstr "Imposta dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "modifica"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #, fuzzy
 msgid "Edit user"
@@ -3504,20 +3591,22 @@ msgstr "Modifica contatto"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3525,8 +3614,8 @@ msgid "delete"
 msgstr "elimina"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #, fuzzy
 msgid "Delete user"
@@ -3539,13 +3628,14 @@ msgstr "Liste di blocco"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3759,7 +3849,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
@@ -3833,7 +3923,7 @@ msgstr "Cerca"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4007,7 +4097,7 @@ msgid "Add entry"
 msgstr "Aggiungi contatto"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Modifica contatto"
 
@@ -4768,72 +4858,72 @@ msgstr "Amministrazione dei gruppi di utenti"
 msgid "Groups"
 msgstr "Gruppi di utenti"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 #, fuzzy
 msgid "Can't paste"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #, fuzzy
 msgid "Create new group"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4841,10 +4931,10 @@ msgstr "Modifica questo record"
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -4853,27 +4943,27 @@ msgstr "Modifica questo record"
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Applicazione"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 #, fuzzy
 msgid "Groupname"
 msgstr "Nome gruppo"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4883,75 +4973,75 @@ msgstr "Nome gruppo"
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Amministratori di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Ospiti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+msgid "! unknown id"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-msgid "! unknown id"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -4980,7 +5070,7 @@ msgstr "Applicazioni disponibili"
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Oggetto"
 
@@ -5110,6 +5200,7 @@ msgstr "Selezioni utenti da aggiungere"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -5148,100 +5239,100 @@ msgstr "Mostra l'indirizzo del dipartimento"
 msgid "Display addresses matching"
 msgstr "Mostra gli indirizzi che corrispondono"
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Elimina estensioni per le applicazioni"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr "Questo gruppo non possiede estensioni per le applicazioni."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Crea estensioni per le applicazioni"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr "Questo gruppo non possiede estensioni per le applicazioni."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "L'uid contiene dei caratteri invalidi!"
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 #, fuzzy
 msgid "department"
 msgstr "dipartimenti"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 #, fuzzy
 msgid "application"
 msgstr "applicazioni"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 #, fuzzy
 msgid "Delete entry"
 msgstr "Elimina questo record"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 #, fuzzy
 msgid "Move down"
 msgstr "Dominio"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 #, fuzzy
 msgid "Check parameter"
 msgstr "Parametro"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5337,58 +5428,58 @@ msgstr ""
 msgid "Users"
 msgstr "Utenti"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "Create new user"
 msgstr "Crea in"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "New user"
 msgstr "utenti"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 #, fuzzy
 msgid "Create new template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 #, fuzzy
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5397,65 +5488,70 @@ msgstr "Password"
 msgid "Username"
 msgstr "Nome utente"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Modifica proprietà"
+
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 #, fuzzy
 msgid "Online"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 msgid "Offline"
 msgstr ""
 
@@ -5471,12 +5567,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr ""
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5529,7 +5626,7 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Nome applicazione"
 
@@ -5544,8 +5641,8 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5687,23 +5784,23 @@ msgstr ""
 msgid "Application settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 #, fuzzy
 msgid "new"
 msgstr "Nuovo"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #, fuzzy
 msgid "Create new application"
 msgstr "Crea estensioni per le applicazioni"
@@ -5941,9 +6038,9 @@ msgstr "presente"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -5984,27 +6081,27 @@ msgstr ""
 msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
 msgid "Mail server"
 msgstr "Server"
@@ -6118,12 +6215,12 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -6132,128 +6229,133 @@ msgstr ""
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Scegli il subtree dove mettere i terminali"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Azione"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr ""
 
@@ -6269,7 +6371,7 @@ msgstr ""
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr ""
 
@@ -6277,15 +6379,15 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr ""
 
@@ -6343,27 +6445,27 @@ msgstr ""
 msgid "Admins"
 msgstr "DN dell'amministratore"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6371,57 +6473,107 @@ msgstr ""
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+#, fuzzy
+msgid "Activated"
+msgstr "Privato"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+msgid "Memory test"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+#, fuzzy
+msgid "System analysis"
+msgstr "Log di sitema"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+#, fuzzy
+msgid "Instant update"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Scheduled update"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+#, fuzzy
+msgid "Rescan hardware"
+msgstr "Dispositivo telefonico"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 #, fuzzy
 msgid "The required field 'Server name' is not set."
 msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
@@ -6445,53 +6597,19 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-#, fuzzy
-msgid "Activated"
-msgstr "Privato"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-#, fuzzy
-msgid "System analysis"
-msgstr "Log di sitema"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#, fuzzy
-msgid "Instant update"
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Dispositivo telefonico"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
@@ -6499,197 +6617,221 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal template"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal"
 msgstr "Terminali"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation template"
 msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation"
 msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 #, fuzzy
 msgid "New Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 #, fuzzy
 msgid "New Printer"
 msgstr "Stampante"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 #, fuzzy
 msgid "New Phone"
 msgstr "Telefono"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista dei sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #, fuzzy
 msgid "Delete system"
 msgstr "Rimuovi"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "System"
 msgstr "Sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 #, fuzzy
 msgid "Cups Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Mostra server"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 #, fuzzy
 msgid "Mail Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 #, fuzzy
 msgid "Imap Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 #, fuzzy
 msgid "Fax Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
 msgid "Set root password"
 msgstr "Cambia password"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 #, fuzzy
 msgid "New System from incoming"
 msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 #, fuzzy
 msgid "Winstation"
 msgstr "Amministrazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 #, fuzzy
 msgid "Network Device"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 #, fuzzy
 msgid "New Device"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr ""
 
@@ -6918,68 +7060,84 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Lista dei sistemi"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Mostra server"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Mostra terminali"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Mostra workstation"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Mostra workstation Windows"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Mostra stampanti di rete"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Mostra telefoni"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr "Mostra dispositiva di rete"
 
@@ -6988,6 +7146,7 @@ msgid "Regular expression for matching system names"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 #, fuzzy
 msgid "Display systems of user"
 msgstr "Mostra l'indirizzo dell'utente"
@@ -7057,6 +7216,109 @@ msgstr ""
 msgid "No SMTP privileged networks set."
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Elimina foto"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+#, fuzzy
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+#, fuzzy
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+#, fuzzy
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+#, fuzzy
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Informazioni organizzazione"
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Gruppo"
+
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
 msgid ""
@@ -7198,16 +7460,16 @@ msgstr "Modifica contatto"
 msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 #, fuzzy
 msgid "Codepage"
 msgstr "Home Page"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 #, fuzzy
 msgid "Option"
 msgstr "Opzioni"
@@ -7314,42 +7576,42 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 #, fuzzy
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Rimuovi"
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
 msgid "Please specify a valid name for your setup."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 #, fuzzy
 msgid "Please specify a name for your setup."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
@@ -7752,27 +8014,27 @@ msgid "Boot parameters"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr ""
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr ""
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 #, fuzzy
 msgid "FAI server"
@@ -8028,7 +8290,6 @@ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #, fuzzy
@@ -8830,13 +9091,15 @@ msgstr "Directory"
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -8845,12 +9108,13 @@ msgid "Choose a system type"
 msgstr "Scegli il tuo numero di telefono personale"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Nome descrittivo del gruppo"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Gruppo di oggetti"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -9008,103 +9272,15 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:276
-#, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr "Questa identità non possiede estensioni di posta."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Elimina foto"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-#, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr "Questa identià possiede estensioni di posta."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-#, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr "Questa identià possiede estensioni di posta."
-
-#: plugins/admin/systems/class_printGeneric.inc:292
+#: plugins/admin/systems/class_divListSystem.inc:55
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr "Questa identità non possiede estensioni di posta."
-
-#: plugins/admin/systems/class_printGeneric.inc:295
-#, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni di posta."
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
+msgid "System / Department"
+msgstr "Dipartimento"
 
-#: plugins/admin/systems/class_printGeneric.inc:475
+#: plugins/admin/systems/class_divListSystem.inc:169
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Informazioni organizzazione"
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Gruppo"
+msgid "Set root       password"
+msgstr "Cambia password"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
@@ -9643,9 +9819,10 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
 msgid "Download"
@@ -10141,11 +10318,6 @@ msgstr "Mostra terminali"
 msgid "List of template files"
 msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Scegli il subtree per l'utente"
-
 #: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
 msgid "List of hook scripts"
@@ -11266,44 +11438,51 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Lista degli utenti di %s su %s"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11314,19 +11493,19 @@ msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -11566,7 +11745,17 @@ msgstr "Supporto per nagios disabilitato. Manca il file di schema?"
 msgid "Support for nagios enabled"
 msgstr "Supporto per nagios abilitato."
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr "Supporto per nagios disabilitato. Manca il file di schema?"
+
 #: include/functions_setup.inc:256
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Supporto per nagios abilitato."
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11574,41 +11763,41 @@ msgstr ""
 "Supporto per Kolab disabilitato. Manca il file di schema?Il metodo di "
 "amministrazine della posta è impostato su cyrus"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Supporto per Kolab abilitato."
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Ignora"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Fallito"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Ispezione della configurazione PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Controllo della versione di PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr "PHP deve essere la versione 4.1.0 o superiore."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Controllo se register_globals e impostato su 'off'"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -11617,36 +11806,36 @@ msgstr ""
 "register_globals è un meccanismo PHP che può comportare maggiori rischi per "
 "la sicurezza. GOsa funziona in entrambe le modalità"
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Controllo il modulo ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "Questo è il modulo più importante usato da GOsa ed è quindi necessario."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for XML functions"
 msgstr "Controllo le funzioni XML"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Controllo il support per gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Gettext è necessario al supporto per le lingue."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Controllo il supporto per iconv"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11654,11 +11843,11 @@ msgstr ""
 "Questo modulo è usato da GOsa per convertire alcune informazioni usate da "
 "samba ed è necessario."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Controllo il module mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -11667,21 +11856,21 @@ msgstr ""
 "gli schemi classici 'crypt' e 'md5' ignora queso messaggio. GOsa funziona "
 "correttamente anche senza."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Controllo il modulo imap"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr "Questo modulo è necessario per comunicare con il server di posta."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Controllo il supporto per getacl"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -11690,21 +11879,21 @@ msgstr ""
 "Il support per getacl serve a ottenere i permessi di accesso delle cartelle "
 "di posta sul server. GOsa funziona correttamente anche senza."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Controllo il modulo mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Queso modulo serve a leggere i report di GOfax dal database.GOsa funziona "
 "correttamente anche senza."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Controllo il modulo cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11712,11 +11901,11 @@ msgstr ""
 "Questo modulo serve a ottenere le informazioni sulle stampanti di rete. GOsa "
 "funziona correttamente anche senza."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Controllo il modulo kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11724,25 +11913,25 @@ msgstr ""
 "Questo modulo serve ad amministrare gli utenti in un dominio Kerberos. GOsa "
 "funziona correttamente anche senza."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 msgid "Checking for snmp Module"
 msgstr "Controllo il modulo snmp"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 msgid "PHP detailed function inspection"
 msgstr "Ispezione dettagliata delle funzioni PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, php-format
 msgid "Checking for function %s"
 msgstr "Controllo il supporto per %s"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11751,15 +11940,15 @@ msgstr ""
 "La funzione %s è usata da GOsa. Non è specificato se è opzionale o "
 "necessaria."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Controllo la presenza di alcuni programmi addizionali"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Controllo per ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11767,21 +11956,21 @@ msgstr ""
 "Il programma ImageMagick serve a convertire le immagini fornite dagli utenti "
 "nelle dimensioni e nel formato di default."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Controllo il supporto per fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11789,11 +11978,11 @@ msgstr ""
 "Il programma fping è usato solo nel caso di ambienti basati su terminali "
 "'thin client'."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Controllo la possibilità di generare password con algoritmo LM/NT"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11801,11 +11990,11 @@ msgstr ""
 "Un programma in grado di generare password con algoritmo LM/NT è necessario "
 "per poter usare Samba 2 o 3."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "Controllo php.ini per session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11813,11 +12002,11 @@ msgstr ""
 "Per non avere problemi con GOsa è necessario impostare l'opzione session."
 "auto_register su 'off' nel file php.ini"
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "Controllo php.ini per implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11825,11 +12014,11 @@ msgstr ""
 "Per motivi di performance è consigliato di impostare l'opzione "
 "implicit_flush su 'off' nel file php.ini."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "Controllo php.ini per max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11837,11 +12026,11 @@ msgstr ""
 "Per non avere problemi con GOsa è necessario impostare l'opzione "
 "max_execution_time a 30 secondi o più nel file php.ini"
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "Controllo php.ini per memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -11849,11 +12038,11 @@ msgstr ""
 "Per non avere problemi con GOsa è necessario impostare l'opzione "
 "memory_limit a 16MB o più nel file php.ini"
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "Controllo php.ini per expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -11861,11 +12050,11 @@ msgstr ""
 "Per motivi di sicurezza è consigliato di impostare l'opzione expose_php su "
 "'off' nel file php.ini."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "Controllo php.ini per magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11873,49 +12062,49 @@ msgstr ""
 "Per motivi di sicurezza è consigliato di impostare l'opzione "
 "magic_quotes_gpc su 'on' nel file php.ini."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
 msgstr ""
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr "Manca il campo obbligatorio '%s'. Completarlo, prego. "
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Accesso al server LDAP fallito. La ragione è: %s."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -11976,7 +12165,7 @@ msgid ""
 "getting dns informations for this device."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr ""
@@ -12657,9 +12846,9 @@ msgstr ""
 msgid "Operation complete"
 msgstr "incompleto"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Esegui"
+#, fuzzy
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Scegli il subtree per l'utente"
 
 #, fuzzy
 #~ msgid "save"

diff --git a/locale/messages.po b/locale/messages.po
index b8e061f336d903c11ba253b203f0f5786ee12805..937fbca569458ea5ee4e782781282d5f2f116988 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -2,19 +2,19 @@
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -39,21 +39,21 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -61,42 +61,47 @@ msgstr ""
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -105,29 +110,29 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -135,30 +140,30 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -178,29 +183,30 @@ msgstr ""
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -209,11 +215,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -222,73 +228,73 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr ""
 
@@ -325,7 +331,8 @@ msgstr ""
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr ""
 
@@ -392,6 +399,8 @@ msgstr ""
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -421,7 +430,7 @@ msgstr ""
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -442,7 +451,7 @@ msgstr ""
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -451,21 +460,21 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -518,7 +527,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -535,7 +544,7 @@ msgstr ""
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr ""
 
@@ -578,6 +587,8 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -599,7 +610,7 @@ msgstr ""
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -703,12 +714,12 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -721,7 +732,7 @@ msgstr ""
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr ""
@@ -730,7 +741,8 @@ msgstr ""
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -755,7 +767,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -916,8 +927,8 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr ""
 
@@ -991,10 +1002,11 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1013,14 +1025,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1147,6 +1159,7 @@ msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr ""
 
@@ -1171,7 +1184,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr ""
@@ -1361,7 +1374,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1396,12 +1409,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
@@ -1442,7 +1455,7 @@ msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1739,7 +1752,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -1749,7 +1762,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -1888,21 +1901,22 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -1920,8 +1934,8 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -1980,10 +1994,10 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2026,7 +2040,7 @@ msgstr ""
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
@@ -2534,7 +2548,8 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr ""
 
@@ -2654,7 +2669,7 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2781,29 +2796,29 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 msgid "Admin"
 msgstr ""
 
@@ -2846,7 +2861,7 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -2962,7 +2977,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 msgid "Close"
 msgstr ""
 
@@ -3076,6 +3091,57 @@ msgstr ""
 msgid "Nagios settings"
 msgstr ""
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+msgid "This account has no netatalk extensions."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid "Remove netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr ""
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr ""
@@ -3172,13 +3238,14 @@ msgid "Please specify a valid phone number."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3187,13 +3254,14 @@ msgid "Go to root department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3202,13 +3270,14 @@ msgid "Root"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3217,14 +3286,15 @@ msgid "Go up one department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3235,12 +3305,13 @@ msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3248,13 +3319,14 @@ msgid "Go to users department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3263,13 +3335,14 @@ msgid "Home"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3279,19 +3352,21 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3312,12 +3387,13 @@ msgid "New Blocklist"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3326,56 +3402,61 @@ msgid "Submit department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3383,8 +3464,8 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Delete user"
 msgstr ""
@@ -3395,13 +3476,14 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3611,7 +3693,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr ""
@@ -3684,7 +3766,7 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -3855,7 +3937,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr ""
 
@@ -4594,66 +4676,66 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 msgid "Paste"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 msgid "Can't paste"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4661,10 +4743,10 @@ msgstr ""
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -4673,25 +4755,25 @@ msgstr ""
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 msgid "Groupname"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4701,75 +4783,75 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+msgid "! unknown id"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-msgid "! unknown id"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -4795,7 +4877,7 @@ msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr ""
 
@@ -4920,6 +5002,7 @@ msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -4958,93 +5041,93 @@ msgstr ""
 msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 msgid "department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5136,54 +5219,54 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5192,55 +5275,59 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Edit netatalk properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 msgid "Offline"
 msgstr ""
 
@@ -5256,12 +5343,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr ""
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5312,7 +5400,7 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr ""
 
@@ -5327,8 +5415,8 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5468,22 +5556,22 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 msgid "Create new application"
 msgstr ""
 
@@ -5713,9 +5801,9 @@ msgstr ""
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -5756,27 +5844,27 @@ msgstr ""
 msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr ""
 
@@ -5889,12 +5977,12 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -5903,128 +5991,133 @@ msgstr ""
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr ""
 
@@ -6040,7 +6133,7 @@ msgstr ""
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr ""
 
@@ -6048,15 +6141,15 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr ""
 
@@ -6110,27 +6203,27 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6138,56 +6231,102 @@ msgstr ""
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+msgid "Activated"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+msgid "Memory test"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+msgid "System analysis"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+msgid "Instant update"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Scheduled update"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+msgid "Rescan hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
@@ -6211,49 +6350,19 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
@@ -6261,171 +6370,195 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr ""
 
@@ -6649,68 +6782,84 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr ""
 
@@ -6719,6 +6868,7 @@ msgid "Regular expression for matching system names"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Display systems of user"
 msgstr ""
 
@@ -6787,6 +6937,102 @@ msgstr ""
 msgid "No SMTP privileged networks set."
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+msgid "Remove printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+msgid "can't get ppd informations."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr ""
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -6915,15 +7161,15 @@ msgstr ""
 msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 msgid "Codepage"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 msgid "Option"
 msgstr ""
 
@@ -7018,36 +7264,36 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr ""
 
@@ -7429,27 +7675,27 @@ msgid "Boot parameters"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr ""
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr ""
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 msgid "FAI server"
 msgstr ""
@@ -7684,7 +7930,6 @@ msgstr ""
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
@@ -8401,13 +8646,15 @@ msgstr ""
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -8415,11 +8662,11 @@ msgid "Choose a system type"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
+msgid "Inherit settings from this object group"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -8568,95 +8815,12 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/class_divListSystem.inc:55
+msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:276
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-msgid "Remove printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:292
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:295
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:475
-msgid "can't get ppd informations."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
+#: plugins/admin/systems/class_divListSystem.inc:169
+msgid "Set root       password"
 msgstr ""
 
 #: plugins/admin/ogroups/headpage.tpl:24
@@ -9171,9 +9335,10 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr ""
@@ -9610,10 +9775,6 @@ msgstr ""
 msgid "List of template files"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
 msgstr ""
@@ -10645,44 +10806,51 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, php-format
 msgid "Creating copy of %s"
 msgstr ""
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -10693,19 +10861,19 @@ msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -10941,318 +11109,326 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr ""
 
+#: include/functions_setup.inc:251
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+
 #: include/functions_setup.inc:256
+msgid "Support for netatalk enabled"
+msgstr ""
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
 msgstr ""
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
 msgstr ""
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -11310,7 +11486,7 @@ msgid ""
 "getting dns informations for this device."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr ""
@@ -11944,7 +12120,3 @@ msgstr ""
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 msgid "Operation complete"
 msgstr ""
-
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr ""

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index 8663c318a97ed2faee13c289f1c1eb76e41ff621..5a140f9f797784dc5264e1ee5dd97d84089bb84d 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -23,19 +23,19 @@ msgstr ""
 msgid "My account"
 msgstr "Mijn account"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administratie"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Toevoegingen"
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -60,21 +60,21 @@ msgstr "Toevoegingen"
 msgid "Generic"
 msgstr "Algemeen"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Omgeving"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -82,42 +82,47 @@ msgstr "Omgeving"
 msgid "Mail"
 msgstr "E-mail"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Verbindingen"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: 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:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -126,29 +131,29 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Telefoon"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf: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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Referenties"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Programma's"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "Rechten"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -156,30 +161,30 @@ msgstr "Rechten"
 msgid "Options"
 msgstr "Opties"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr "Parameters"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Opstarten"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Apparaten"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Printer"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -199,29 +204,30 @@ msgstr "Printer"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Informatie"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Databases"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Verzamelplaats"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -230,11 +236,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exporteer"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 msgid "Excel Export"
 msgstr "Excel Export"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -243,73 +249,73 @@ msgstr "Excel Export"
 msgid "Import"
 msgstr "Importeren"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 msgid "Partitions"
 msgstr "Partities"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 msgid "Variables"
 msgstr "Variabelen"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profielen"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 msgid "Packages"
 msgstr "Pakketten"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Duits"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Spaans"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Frans"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Engels"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italiaans"
 
@@ -346,7 +352,8 @@ msgstr "Selecteer de toe te voegen adressen"
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filters"
 
@@ -413,6 +420,8 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -442,7 +451,7 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -463,7 +472,7 @@ msgstr "Toevoegen"
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -472,21 +481,21 @@ msgstr "Toevoegen"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -539,7 +548,7 @@ msgstr "Primair adres"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -556,7 +565,7 @@ msgstr "Quota gebruik"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "niet gedefiniëerd"
 
@@ -599,6 +608,8 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -620,7 +631,7 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -728,12 +739,12 @@ msgstr "schakelt alle E-mail opties uit!"
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -746,7 +757,7 @@ msgstr "schakelt alle E-mail opties uit!"
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Opslaan"
@@ -755,7 +766,8 @@ msgstr "Opslaan"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -767,7 +779,7 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -782,7 +794,6 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bewerken"
@@ -958,8 +969,8 @@ msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
@@ -1040,10 +1051,11 @@ msgstr "Terug"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1064,7 +1076,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1073,7 +1085,7 @@ msgstr ""
 "overeen."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
@@ -1201,6 +1213,7 @@ msgstr "Toon systemen van afdeling"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Toon de overeenkomende systemen"
 
@@ -1225,7 +1238,7 @@ msgstr "niet geconfigureerd"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automatisch"
@@ -1424,7 +1437,7 @@ msgstr "December"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1459,12 +1472,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "De opgegeven 'UID' waarde is te klein."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "De opgegeven 'GID' waarde is niet geldig."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "De opgegeven 'GID' waarde is te klein."
 
@@ -1508,7 +1521,7 @@ msgstr ""
 "De waarde opgegeven voor 'shadowMin' moet kleiner zijn dan 'shadowMax'."
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
@@ -1824,7 +1837,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
@@ -1834,7 +1847,7 @@ msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
@@ -1977,21 +1990,22 @@ msgstr "Voorkeurstaal"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -2009,8 +2023,8 @@ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2070,10 +2084,10 @@ msgstr "Organisatie"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2116,7 +2130,7 @@ msgstr "Pieper"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Plaats"
 
@@ -2642,7 +2656,8 @@ msgid "Template user"
 msgstr "Sjabloongebruiker"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr "Geblokkeerd"
 
@@ -2769,7 +2784,7 @@ msgid "Hotplug device settings"
 msgstr "Hotplug apparaat instellingen"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2904,11 +2919,11 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "U moet een geldig mountpunt opgeven."
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 msgid "Please set a valid profile quota size."
 msgstr "Geef a.u.b. een geldige profiel quota grootte op."
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -2916,21 +2931,21 @@ msgstr ""
 "U dient posix mogelijkheden in te schakelen om omgevingsmogelijkheden in te "
 "kunnen schakelen."
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Kan de nieuwe kios profielen niet opslaan. Mogelijk is de toegang geweigerd "
 "tot de directory"
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr "Fout bij het schrijven van de printer"
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr "Fout bij het schrijven van de printer instellingen"
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -2973,7 +2988,7 @@ msgstr "Scriptnaam"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3091,7 +3106,7 @@ msgstr "Doorzoek"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 msgid "Close"
 msgstr "Sluiten"
 
@@ -3209,6 +3224,69 @@ msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
 msgid "Nagios settings"
 msgstr "Nagios instellingen"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Intranet account"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "E-mail account verwijderen"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "E-mail account aanmaken"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "Shares"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Pad"
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Opslaan"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Netwerk instellingen"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Lijst met blokkeerlijsten"
@@ -3308,13 +3386,14 @@ msgid "Please specify a valid phone number."
 msgstr "Geef a.u.b. een geldig telefoonnummer op."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3323,13 +3402,14 @@ msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3338,13 +3418,14 @@ msgid "Root"
 msgstr "Basis"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3353,14 +3434,15 @@ msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3371,12 +3453,13 @@ msgid "Up"
 msgstr "Omhoog"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3384,13 +3467,14 @@ msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3399,13 +3483,14 @@ msgid "Home"
 msgstr "Home"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3415,19 +3500,21 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3448,12 +3535,13 @@ msgid "New Blocklist"
 msgstr "Nieuwe Blokkeerlijst"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3462,56 +3550,61 @@ msgid "Submit department"
 msgstr "Verwerk afdeling"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "edit"
 msgstr "Bewerk"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3519,8 +3612,8 @@ msgid "delete"
 msgstr "Verwijder"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Delete user"
 msgstr "Verwijder gebruiker"
@@ -3531,13 +3624,14 @@ msgstr "Blokkeerlijst naam"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3756,7 +3850,7 @@ msgstr "U probeert een ongeldig telefoonnummer toe te voegen."
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "terug"
@@ -3831,7 +3925,7 @@ msgstr "Zoeken"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4008,7 +4102,7 @@ msgid "Add entry"
 msgstr "Record toevoegen"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Invoer bewerken"
 
@@ -4787,71 +4881,71 @@ msgstr "Groepen beheer"
 msgid "Groups"
 msgstr "Groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "U staat op het punt de groep '%s' te verwijderen."
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr "U heeft geen toestemming om deze groep te verwijderen!"
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 #, fuzzy
 msgid "Paste"
 msgstr "Pad"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 #, fuzzy
 msgid "Can't paste"
 msgstr "Onmiddelijk bijwerken"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 msgid "Create new group"
 msgstr "Nieuwe groep aanmaken"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "cut"
 msgstr "Commando"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4859,10 +4953,10 @@ msgstr "Bewerk deze invoer"
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -4871,25 +4965,25 @@ msgstr "Bewerk deze invoer"
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Programma"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 msgid "Groupname"
 msgstr "Groepnaam"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4899,70 +4993,70 @@ msgstr "Groepnaam"
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr "Deze tabel geeft alle groepen binnen de geselecteerde tree weer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Kan de SID van deze groep niet vinden in de LDAP database of in uw "
 "configuratie bestand."
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr "Deze 'dn' is geen groep."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Windows beheerders"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Windows gasten"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+#, fuzzy
+msgid "! unknown id"
+msgstr "onbekend"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, fuzzy
-msgid "! unknown id"
-msgstr "onbekend"
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -4970,9 +5064,9 @@ msgstr ""
 "Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
 "liggende streepjes zijn toegestaan."
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
 
@@ -5000,7 +5094,7 @@ msgstr "Beschikbare programma's"
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Object"
 
@@ -5129,6 +5223,7 @@ msgstr "Selecteer de toe te voegen gebruikers"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Selecteer om servers te zien"
@@ -5168,15 +5263,15 @@ msgstr "Toon adressen van afdeling"
 msgid "Display addresses matching"
 msgstr "Toon overeenkomende adressen"
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Deze 'dn' is geen programmagroep"
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Programma's verwijderen"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5184,11 +5279,11 @@ msgstr ""
 "Deze groep heeft programma mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Programma's aanmaken"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5196,73 +5291,73 @@ msgstr ""
 "Deze groep heeft programma mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr "De categorienaam bevat ongeldige karakters."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr "De opgegeven categorie bestaat al."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "De geselecteerde programma naam is niet uniek. Controleeer uw LDAP database."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "Het geselecteerde programma heeft geen opties."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 msgid "department"
 msgstr "afdeling"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 msgid "application"
 msgstr "programma"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Delete entry"
 msgstr "Verwijder invoer"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr "Omhoog verplaatsen"
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Move down"
 msgstr "Omlaag verplaatsen"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr "Scheidingsteken invoegen"
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 #, fuzzy
 msgid "This application is no longer available."
 msgstr "Het geselecteerde programma heeft geen opties."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 #, fuzzy
 msgid "Check parameter"
 msgstr "Opstart parameters"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 #, fuzzy
 msgid "This application has changed parameters."
 msgstr "Het geselecteerde programma heeft geen opties."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5364,55 +5459,55 @@ msgstr ""
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van deze gebruiker veranderen!"
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "U staat op het punt gebruiker %s te verwijderen."
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Er bestaat al een persoon met deze naam in deze tree."
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "Create new user"
 msgstr "Maak nieuwe gebruiker aan"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 msgid "New user"
 msgstr "Nieuwe gebruiker"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "Create new template"
 msgstr "Maak nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 msgid "password"
 msgstr "wachtwoord"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5421,55 +5516,60 @@ msgstr "wachtwoord"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr "Deze tabel geeft alle gebruikers in de geselecteerde tree weer"
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 msgid "Edit UNIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Edit fax properies"
 msgstr "Bewerk Fax eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Bewerk E-mail eigenschappen"
+
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Create user from template"
 msgstr "Maak gebruiker aan vanuit sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 msgid "Create user with this template"
 msgstr "Maak gebruiker aan met dit sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 msgid "Online"
 msgstr "Online"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 msgid "Offline"
 msgstr "Offline"
 
@@ -5488,12 +5588,13 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr "Sjabloon"
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5547,7 +5648,7 @@ msgstr "Reguliere expressie voor overeenkomende programma namen"
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Programmanaam"
 
@@ -5562,8 +5663,8 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Te tonen programma naam (bv. onder iconen)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5712,22 +5813,22 @@ msgstr "Er is al een programma met deze 'Naam'."
 msgid "Application settings"
 msgstr "Programma opties"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "U staat op het punt de programma '%s' te verwijderen."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "U heeft geen toestemming dit programma te verwijderen"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 msgid "new"
 msgstr "nieuw"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 msgid "Create new application"
 msgstr "Nieuw programma aanmaken"
 
@@ -5971,9 +6072,9 @@ msgstr "aanwezig"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Deze 'dn' heeft geen terminal mogelijkheden."
 
@@ -6018,27 +6119,27 @@ msgstr "Tijd Service"
 msgid "LDAP Service"
 msgstr "LDAP Service"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Terminal Service"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 msgid "Temporary disable login"
 msgstr "Schakel inlog mogelijkheid tijdelijk uit"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 msgid "Font path"
 msgstr "Fontpad"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 msgid "Syslog Service"
 msgstr "Syslog Service"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 msgid "Print Service"
 msgstr "Print Service"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Mail server"
 
@@ -6152,12 +6253,12 @@ msgstr ""
 "U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
@@ -6166,128 +6267,133 @@ msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
 msgid "System management"
 msgstr "Systeembeheer"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Terminal sjabloon"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Terminal naam"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Selecteer de subtree waar de terminal onder geplaatst zal worden"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modus"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Selecteer terminal modus"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Syslog server"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr "Root server"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Swap server"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Syslog server"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "NTP tijdserver"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Actie"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr "Selecteer de voor deze terminal uit te voeren actie"
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "standaard"
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "toon keuze-mogelijkheid"
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "direkt"
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "load balanced"
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "ICA client"
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 msgid "Choose the phone located at the current terminal"
 msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr "Geef a.u.b. een geldig VSync bereik op."
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr "Geef a.u.b. een geldig HSync bereik op."
 
@@ -6305,7 +6411,7 @@ msgstr ""
 msgid "Server name"
 msgstr "Servernaam"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 msgid "Select action to execute for this server"
 msgstr "Selecteer de voor deze server uit te voeren actie"
 
@@ -6313,15 +6419,15 @@ msgstr "Selecteer de voor deze server uit te voeren actie"
 msgid "Phone name"
 msgstr "Telefoonnaam"
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal server moet een fontpath hebben."
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Werkstation sjabloon"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Werkstation naam"
 
@@ -6375,27 +6481,27 @@ msgstr "Gebruikers die deze printer mogen beheren"
 msgid "Admins"
 msgstr "Beheerders"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "tekst"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "grafisch"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Er is geen 'WAKECMD' gedefiniëerd in uw gosa.conf"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6403,58 +6509,105 @@ msgstr "Er is geen 'WAKECMD' gedefiniëerd in uw gosa.conf"
 msgid "Execution of '%s' failed!"
 msgstr "Uitvoer van '%s' is mislukt!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Er is geen 'REBOOTCMD' in uw gosa.conf gedefiniëerd"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Er is geen 'HALTCMD' in uw gosa.conf gedefiniëerd"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Uitschakelen"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een nieuwe terminal aan te maken onder deze "
 "'basis'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr "Het vereiste veld 'Terminal naam' is leeg."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+#, fuzzy
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr "Er moet tenminste een wachtrijnummer gedefinieerd zijn."
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+msgid "Activated"
+msgstr "Geactiveerd"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+msgid "Memory test"
+msgstr "Geheugentest"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+msgid "System analysis"
+msgstr "Systeem analyse"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 msgid "This 'dn' has no server features."
 msgstr "Deze 'dn' heeft geen server mogelijkheden."
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+msgid "Instant update"
+msgstr "Onmiddelijk bijwerken"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+msgid "Scheduled update"
+msgstr "Geplande bijwerking"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr "Herinstalleer"
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+msgid "Rescan hardware"
+msgstr "Hardware opnieuw scannen"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 msgid "The required field 'Server name' is not set."
 msgstr "Het vereiste veld 'Servernaam' is leeg."
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een server aan te maken onder deze 'Basis'."
@@ -6483,50 +6636,20 @@ msgstr ""
 "Deze server heeft DHCP mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Geactiveerd"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Geheugentest"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Systeem analyse"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Es is geen ACTIONCMD definitie in uw gosa.conf gedefiniëerd"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr "Deze 'dn' heeft geen werkstation mogelijkheden."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Onmiddelijk bijwerken"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Geplande bijwerking"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Herinstalleer"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Hardware opnieuw scannen"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een werkstation aan te maken onder deze 'basis'"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 
@@ -6534,176 +6657,200 @@ msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 msgid "Systems"
 msgstr "Systemen"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr "U kunt dit object type nog niet bewerken!"
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "U staat op het punt alle informatie over dit component op '%s' te "
 "verwijderen."
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 msgid "You are not allowed to delete this component!"
 msgstr "U heeft geen toestemming om dit component te verwijderen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr "Nieuw terminal sjabloon"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation template"
 msgstr "Nieuw werkstation sjabloon"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 msgid "New Workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 msgid "New Server"
 msgstr "Nieuwe server"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 msgid "New Printer"
 msgstr "Nieuwe printer"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Phone"
 msgstr "Nieuwe telefoon"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Component"
 msgstr "Nieuw component"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 msgid "Edit system"
 msgstr "Bewerk systeem"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 msgid "Delete system"
 msgstr "Verwijder systeem"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr "Deze tabel toont alle systemen in de geselecteerde tree"
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 msgid "System"
 msgstr "Systeem"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 msgid "Cups Server"
 msgstr "Cups server"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr "Log DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 msgid "Syslog Server"
 msgstr "Syslog server"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 msgid "Mail Server"
 msgstr "Mail server"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 msgid "Imap Server"
 msgstr "Imap server"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 msgid "Nfs Server"
 msgstr "Nfs server"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 msgid "Kerberos Server"
 msgstr "Kerberos server"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 msgid "Asterisk Server"
 msgstr "Asterisk server"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 msgid "Fax Server"
 msgstr "Fax server"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 msgid "Ldap Server"
 msgstr "Ldap server"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 msgid "Set root password"
 msgstr "root wachtwoord instellen"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "New System from incoming"
 msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 msgid "Winstation"
 msgstr "Windows werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 msgid "Network Device"
 msgstr "Netwerk apparaat"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 msgid "New Device"
 msgstr "Nieuw apparaat"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 msgid "Terminal template for"
 msgstr "Terminal sjabloon voor"
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
@@ -6934,10 +7081,13 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr "De imap naam dient een hostnaam of een IP adres te zijn."
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Lijst met systemen"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
@@ -6947,58 +7097,71 @@ msgstr ""
 "geweest zijn."
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Toon servers"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 msgid "Select to see Linux terminals"
 msgstr "Selecteer om Linux terminals te zien"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Toon terminals"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 msgid "Select to see Linux workstations"
 msgstr "Selecteer om Linux werkstations te zien"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Toon werkstations"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Selecteer om Microsoft Windows werkstations te zien"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Toon Windows werkstations"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr "Selecteer om netwerk printers te zien"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Toon netwerk printers"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr "Selecteer om VOIP telefoons te zien"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Toon telefoons"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see network devices"
 msgstr "Selecteer om netwerk apparaten te zien"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show network devices"
 msgstr "Toon netwerk apparaten"
 
@@ -7007,6 +7170,7 @@ msgid "Regular expression for matching system names"
 msgstr "Reguliere expressie voor overeenkomende systeemnamen"
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Display systems of user"
 msgstr "Toon systemen van gebruiker"
 
@@ -7087,6 +7251,116 @@ msgstr "Toekomstige dagen moet een waarde bevatten."
 msgid "No SMTP privileged networks set."
 msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr "Voeg printer extensie toe"
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr "Deze 'dn' heeft geen printer mogelijkheden."
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze niet "
+"inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
+"dat u een nieuwe terminal sjabloon aan het maken bent."
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+msgid "Remove printer extension"
+msgstr "Verwijder printer mogelijkheden"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+msgid "can't get ppd informations."
+msgstr "kan de PPD informatie niet ophalen"
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+"Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+"Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Groep"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7226,15 +7500,15 @@ msgstr "Bewerk share"
 msgid "NFS setup"
 msgstr "NFS instellingen"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Pad"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 msgid "Codepage"
 msgstr "Karakterset"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 msgid "Option"
 msgstr "Optie"
 
@@ -7335,40 +7609,40 @@ msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 "Het bestand '/etc/gosa/encodings' bestaat niet. Kan de ondersteunde "
 "karaktersets niet ophalen."
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 "Kan bestand '/etc/gosa/encodings' niet openen. Controlleer de "
 "bestandspermissies a.u.b."
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 msgid "Please specify a valid path for your setup."
 msgstr "Geef a.u.b. een geldig pad op voor uw instellingen."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a valid name for your setup."
 msgstr "Geef a.u.b. een geldige naam op voor uw instellingen."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 msgid "Please specify a name for your setup."
 msgstr "Geef a.u.b. een naam op voor uw instellingen."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 msgid "Description contains invalid characters."
 msgstr "De omschrijving bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr "Het pad bevat ongeldige karakters."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr "De optie bevat ongeldige karakters."
 
@@ -7755,21 +8029,16 @@ msgid "Boot parameters"
 msgstr "Opstart parameters"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP server"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Boot kernel"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Aangepaste opties"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
@@ -7778,6 +8047,11 @@ msgstr ""
 "Geef parameters op die meegeven worden aan de kernel als append regel "
 "tijdens het opstarten"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP server"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 msgid "FAI server"
 msgstr "FAI server"
@@ -8028,7 +8302,6 @@ msgstr "Reguliere expressie voor overeenkomende apparaat namen"
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
@@ -8814,11 +9087,12 @@ msgid "Zone records"
 msgstr "DNS records"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
+#, fuzzy
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 "Dit is een nieuw systeem, welke momenteel geen systeemtype toegekend "
 "gekregen heeft. Selecteer a.u.b. een systeemtype voor dit systeem. "
@@ -8828,7 +9102,10 @@ msgstr ""
 "de groep toegevoegd worden."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+#, fuzzy
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr "Selecteer a.u.b. een systeemtype en indien gewenst een objectgroep."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -8836,11 +9113,13 @@ msgid "Choose a system type"
 msgstr "Kies een systeemtype"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr "Groepslidmaatschap in de volgende objectgroepen."
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Omschrijving voor deze groep"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+#, fuzzy
+msgid "Choose an object group"
 msgstr "Kies een objectgroep"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -8997,110 +9276,15 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr "Voeg printer extensie toe"
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
-
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr "Deze 'dn' heeft geen printer mogelijkheden."
-
-#: plugins/admin/systems/class_printGeneric.inc:276
+#: plugins/admin/systems/class_divListSystem.inc:55
 #, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze niet "
-"inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
-"dat u een nieuwe terminal sjabloon aan het maken bent."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-msgid "Remove printer extension"
-msgstr "Verwijder printer mogelijkheden"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_printGeneric.inc:292
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_printGeneric.inc:295
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
-
-#: plugins/admin/systems/class_printGeneric.inc:475
-msgid "can't get ppd informations."
-msgstr "kan de PPD informatie niet ophalen"
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-"Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-"Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
+msgid "System / Department"
+msgstr "Afdeling"
 
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Groep"
+#: plugins/admin/systems/class_divListSystem.inc:169
+#, fuzzy
+msgid "Set root       password"
+msgstr "root wachtwoord instellen"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 msgid ""
@@ -9637,9 +9821,10 @@ msgstr "Kies een te bewerken of verwijderen variabele"
 msgid "Fully Automatic Installation"
 msgstr "Fully Automatic Installation"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
 msgid "Download"
@@ -10095,10 +10280,6 @@ msgstr "Variabele inhoud"
 msgid "List of template files"
 msgstr "Lijst met sjabloonbestanden"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr "Selecteer een te bewerken of verwijderen sjabloon"
-
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
 msgstr "Lijst met inhakers scripts"
@@ -11241,27 +11422,34 @@ msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Gebruikerslijst van %s in %s "
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 #, fuzzy
 msgid "Processing"
 msgstr "Processor"
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 #, fuzzy
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fout bij het schrijven van de printer"
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11270,7 +11458,7 @@ msgstr ""
 "Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
 "Rapporteer dit a.u.b. aan het GOsa team."
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -11279,12 +11467,12 @@ msgstr ""
 "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
 "beginnen met 'dn: ...' op regel %s"
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11299,7 +11487,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -11307,7 +11495,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -11315,7 +11503,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -11592,7 +11780,18 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr "Nagios ondersteuning is ingeschakeld"
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"Nagios ondersteuning is uitgeschakeld. Het LDAP schema is niet geïnstalleerd."
+
 #: include/functions_setup.inc:256
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Nagios ondersteuning is ingeschakeld"
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11600,31 +11799,31 @@ msgstr ""
 "Kolab ondersteuning is uitgeschakeld. Aangezien het LDAP schema niet "
 "geïnstalleed is, zal deE-mail methode op Cyrus ingesteld worden."
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Kolab ondersteuning is ingeschakeld"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Mislukt"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "PHP configuratie inspectie"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Controle op PHP versie (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11633,11 +11832,11 @@ msgstr ""
 "functionaliteit die in voorgaande versies niet goed of helemaal niet "
 "voorhanden is."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Controle of 'register_globals' ingesteld staat op 'off'"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -11648,38 +11847,38 @@ msgstr ""
 "veranderd hoeft te worden. Dit is een veiligheidsrisico. GOsa zal in beide "
 "modi draaien."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Zoeken naar de LDAP module"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Dit is hoofd module die GOsa nodig heeft en is daarom noodzakelijk."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 msgid "Checking for XML functions"
 msgstr "Zoeken naar XML functies"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "XML functies zijn vereist om het configuratie bestand in te kunnen lezen."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Zoeken naar gettext ondersteuning"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "Gettext ondersteuning is vereist voor ondersteuning van meerdere talen in "
 "GOsa."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11687,11 +11886,11 @@ msgstr ""
 "Deze module wordt gebruikt door GOsa om samba munged dial informatie "
 "(terminal server) te converteren en is daarom vereist."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Zoeken naar de mhash module"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -11699,11 +11898,11 @@ msgstr ""
 "Om SSHA encryptie te gebruiken heeft u deze module nodig. U kunt deze "
 "melding negeren indien u gewoon crypt of md5 encryptie gebruikt."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Zoeken naar de IMAP module"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11712,11 +11911,11 @@ msgstr ""
 "ontvangt status informatie, maakt E-mail gebruikers aan en verwijdert E-mail "
 "gebruikers."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Controle op getacl in imap"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -11726,21 +11925,21 @@ msgstr ""
 "IMAP module is niet in staat om acl's te lezen. U heeft een recente PHP "
 "versie nodig voor deze mogelijkheid."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Zoeken naar MySQL module"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "MySQL ondersteuning is nodig voor het lezen van GOfax rapporten uit "
 "databases."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Zoeken naar CUPS module"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11748,11 +11947,11 @@ msgstr ""
 "U moet de CUPS module installeren om beschikbare printers via het IPP "
 "protocol te kunnen aflezen i.p.v. via printcap bestanden."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Zoeken naar kadm5 module"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11760,27 +11959,27 @@ msgstr ""
 "Het beheren van gebruikers in kerberos vereist de kadm5 module welke via het "
 "PEAR netwerk te downloaden is."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 msgid "Checking for snmp Module"
 msgstr "Zoeken naar de SNMP module"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Het Simple Network Management Protocol (SNMP) is vereist voor werkstation "
 "monitoring."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 msgid "PHP detailed function inspection"
 msgstr "Gedteaileerde PHP functie inspectie"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, php-format
 msgid "Checking for function %s"
 msgstr "Zoeken naar functie %s"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11789,15 +11988,15 @@ msgstr ""
 "De functie '%s' wordt gebruikt door GOsa. Er is nog geen informatie "
 "voorhanden of deze functie optioneel of vereist is."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Zoeken naar enkele additionele programma's"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Zoeken naar ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11805,11 +12004,11 @@ msgstr ""
 "ImageMagick wordt gebruikt om gebruikers aangeleverde plaatjes te laten "
 "passen binnen de voorgestelde grootte en het uniforme JPEG formaat."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr "Zoeken naar de imagick module voor PHP"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -11817,11 +12016,11 @@ msgstr ""
 "Imagick wordt gebruikt om gebruikers aangeleverde plaatjes te laten passen "
 "binnen de voorgestelde grootte en het uniforme JPEG formaat."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Zoeken naar het fping programma"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11829,11 +12028,11 @@ msgstr ""
 "Het fping programma wordt alleen gebruikt indien u een thin client "
 "gebaseerde terminal omgeving heeft draaien."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Zoeken naar een manier om LM/NT wachtwoord hashes te genereren"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11841,11 +12040,11 @@ msgstr ""
 "Om Samba 2.x/3.x te gebruiken moet u enkele additionele pakketten "
 "installeren om wachtwoord hashes te genereren"
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini controle -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11853,11 +12052,11 @@ msgstr ""
 "Om GOsa zonder problemen te gebruiken, moet de session.auto_register optie "
 "in uw php.ini ingesteld zijn op 'Off'."
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini controle -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11865,11 +12064,11 @@ msgstr ""
 "Deze Optie definieert Uitvoer afhandeling. Zet deze Optie uit om "
 "snelheiswinst te behalen"
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini controle -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11877,11 +12076,11 @@ msgstr ""
 "De uitvoer tijd moet minimaal 30 seconden zijn, omdat sommige acties lang "
 "kunnen duren."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "php.ini controle -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -11890,11 +12089,11 @@ msgstr ""
 "onvoorspelbare fouten opleveren!.Verhoog deze waarde nog verder voor zeer "
 "grote omgevingen."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "php.ini controle -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -11902,11 +12101,11 @@ msgstr ""
 "Verhoog de server veiligheid door 'expose_php' op 'Off' in te stellen. PHP "
 "zal dan geen enkele informatie over de Server die u gebruikt weergeven."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini check -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11914,11 +12113,11 @@ msgstr ""
 "Verhoog de server veiligheid door 'magic_quotes_gpc op 'On' in te stellen."
 "PHP zal dan alle aanhalingstekens in strings omzetten."
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "U moet een LDAP server specificeren voordat u verder gaat!"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -11926,8 +12125,8 @@ msgstr ""
 "Kan niet met de opgegeven LDAP server verbinden! Controleer a.u.b. dat deze "
 "bereikbaar is voor GOsa."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -11935,7 +12134,7 @@ msgstr ""
 "De aanmelding op de LDAP server is mislukt! Controleer a.u.b. dat deze "
 "bereikbaar is voor GOsa."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
@@ -11943,7 +12142,7 @@ msgstr ""
 "Verbinding met de server is succesvol uitgevoerd, maar de server lijkt geen "
 "informatie te bevatten. Controleer alle informatie a.u.b. nogmaals."
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -11952,7 +12151,7 @@ msgstr ""
 "Het vereiste atribuut '%s' uit dit formulier ontbreekt. Maak a.u.b. uw "
 "invoer af!"
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -11960,13 +12159,13 @@ msgstr ""
 "Kan schema informatie niet lezen. GOsa moet uw schema installatie kennen. "
 "Controleer a.u.b. dat deze leesbaar is voor GOsa."
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "De aanmelding op de LDAP server is mislukt. De reden was: '%s'."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -12027,7 +12226,7 @@ msgid ""
 "getting dns informations for this device."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "U staat op het punt de invoer %s te verwijderen."
@@ -12777,9 +12976,11 @@ msgstr ""
 msgid "Operation complete"
 msgstr "onvolledig"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Opslaan"
+#~ msgid "Membership in following objectGroups"
+#~ msgstr "Groepslidmaatschap in de volgende objectgroepen."
+
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Selecteer een te bewerken of verwijderen sjabloon"
 
 #~ msgid "Choose a script to delete or edit"
 #~ msgstr "Selecteer een te bewerken of verwijderen script"

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 453b3e143e25f82373afb7ce8eb3cd3323ce9550..ee8c3c479c73394d58baec8475387503c94c5dc1 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -18,19 +18,19 @@ msgstr ""
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Администрирование"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: 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
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -55,21 +55,21 @@ msgstr "Дополнительно"
 msgid "Generic"
 msgstr "Общее"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Окружение"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:492
@@ -77,42 +77,47 @@ msgstr "Окружение"
 msgid "Mail"
 msgstr "Почта"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Подключение"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
+#: plugins/admin/users/class_userManagement.inc:773
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Факс"
 
-#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:596
@@ -121,29 +126,29 @@ msgstr "Факс"
 msgid "Phone"
 msgstr "Телефон"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Ссылки"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Приложения"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "Доступ"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:100 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
@@ -151,31 +156,31 @@ msgstr "Доступ"
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Запуск"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Устройства"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
 #: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Принтер"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/addons/addressbook/contents.tpl:33
@@ -195,30 +200,31 @@ msgstr "Принтер"
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Информация"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Базы данных"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Сервисы"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
 msgid "Repository"
 msgstr "Повторить"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -227,12 +233,12 @@ msgstr ""
 msgid "Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 #, fuzzy
 msgid "Excel Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -241,17 +247,17 @@ msgstr "Экспорт"
 msgid "Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 #, fuzzy
 msgid "CSV Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 #, fuzzy
 msgid "Partitions"
 msgstr "Назначение"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:93
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -259,62 +265,62 @@ msgstr "Назначение"
 msgid "Script"
 msgstr "Путь к сценариям"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
 #: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
 #: plugins/admin/fai/class_faiManagement.inc:762
 #, fuzzy
 msgid "Variables"
 msgstr "Переменная"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
 #: plugins/admin/fai/class_faiManagement.inc:783
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Путь к профилю"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 #, fuzzy
 msgid "Packages"
 msgstr "Показать телефоны"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr ""
 
@@ -351,7 +357,8 @@ msgstr "Выберите адреса для добавления"
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Фильтры"
 
@@ -418,6 +425,8 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:94
+#: plugins/admin/systems/workstation.tpl:74
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
@@ -447,7 +456,7 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -468,7 +477,7 @@ msgstr "Добавить"
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -477,21 +486,21 @@ msgstr "Добавить"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:642
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:98
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -544,7 +553,7 @@ msgstr "Основной адрес"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_systemManagement.inc:887
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
@@ -561,7 +570,7 @@ msgstr "Использование квоты"
 
 #: 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:472
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "не определена"
 
@@ -605,6 +614,8 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminal.tpl:96
+#: plugins/admin/systems/workstation.tpl:76
 #: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -626,7 +637,7 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
@@ -734,12 +745,12 @@ msgstr "отключает все почтовые настройки!"
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
 #: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/servnfs.tpl:97
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
@@ -752,7 +763,7 @@ msgstr "отключает все почтовые настройки!"
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:61
 #: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Сохранить"
@@ -761,7 +772,8 @@ msgstr "Сохранить"
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
@@ -771,7 +783,7 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -786,7 +798,6 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Изменить"
@@ -957,8 +968,8 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -1041,10 +1052,11 @@ msgstr "Назад"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_divListSystem.inc:169
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
@@ -1063,14 +1075,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -1199,6 +1211,7 @@ msgstr "Показать системы в подразделении"
 
 #: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Display systems matching"
 msgstr "Показать подходяшие системы"
 
@@ -1223,7 +1236,7 @@ msgstr "Не настроено"
 #: plugins/personal/posix/class_posixAccount.inc:196
 #: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_workstationService.inc:133
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "автоматически"
@@ -1424,7 +1437,7 @@ msgstr "Декабрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:578
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
@@ -1459,12 +1472,12 @@ msgid "Value specified as 'UID' is too small."
 msgstr "Значение 'UID' слишком маленькое."
 
 #: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "Значение поля 'GID' некорректно."
 
 #: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "Значение 'GID' слишком маленькое."
 
@@ -1510,7 +1523,7 @@ msgstr ""
 "Значение поля \"shadowMin\" должно быть меньше значения поля \"shadowMax\"."
 
 #: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
@@ -1825,7 +1838,7 @@ msgstr "У вас недостаточно прав для создания по
 
 #: plugins/personal/generic/class_user.inc:959
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:554
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
@@ -1836,7 +1849,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:974
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:557
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
@@ -1984,21 +1997,22 @@ msgstr "Язык по умолчанию"
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:736
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_ogroupManagement.inc:460
 #: plugins/admin/fai/class_faiManagement.inc:679
@@ -2016,8 +2030,8 @@ msgstr "Выберите ветку для пользователя"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/terminal.tpl:22 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
@@ -2077,10 +2091,10 @@ msgstr "Организация"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
 #: plugins/admin/ogroups/class_ogroupManagement.inc:526
 #: plugins/admin/ogroups/class_ogroupManagement.inc:594
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
@@ -2123,7 +2137,7 @@ msgstr "Пейджер"
 #: 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
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Местоположение"
 
@@ -2669,7 +2683,8 @@ msgid "Template user"
 msgstr "Шаблон"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
 msgid "Locked"
 msgstr ""
 
@@ -2804,7 +2819,7 @@ msgid "Hotplug device settings"
 msgstr "Дисковод"
 
 #: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
@@ -2958,30 +2973,30 @@ msgstr ""
 msgid "You must specify a valid mount point."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:770
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:903
+#: plugins/personal/environment/class_environment.inc:909
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:974
+#: plugins/personal/environment/class_environment.inc:980
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1094
 #, fuzzy
 msgid "Admin"
 msgstr "DN администратора"
@@ -3033,7 +3048,7 @@ msgstr "Список"
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:25
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
@@ -3155,7 +3170,7 @@ msgstr "Просмотр"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 #, fuzzy
 msgid "Close"
 msgstr "Выбрать"
@@ -3296,6 +3311,69 @@ msgstr "Введите корректное значение в поле \"Ос
 msgid "Nagios settings"
 msgstr "Почтовые настройки пользователя"
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Создать настройки запись эл. почты"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "сброс"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Готово"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Сетевые настройки"
+
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
 msgstr "Стоп-листы"
@@ -3396,13 +3474,14 @@ msgid "Please specify a valid phone number."
 msgstr "Укажите корректный номер телефона."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:450
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3412,13 +3491,14 @@ msgid "Go to root department"
 msgstr "Список подразделений"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
 #: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_systemManagement.inc:717
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:451
 #: plugins/admin/fai/class_faiManagement.inc:642
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:329
@@ -3428,13 +3508,14 @@ msgid "Root"
 msgstr "Перезагрузить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
@@ -3444,14 +3525,15 @@ msgid "Go up one department"
 msgstr "Подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:719
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:89
 #: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/fai/class_faiManagement.inc:645
@@ -3462,12 +3544,13 @@ msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3476,13 +3559,14 @@ msgid "Go to users department"
 msgstr "Выберите подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:721
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:91
 #: plugins/admin/ogroups/class_ogroupManagement.inc:454
 #: plugins/admin/fai/class_faiManagement.inc:648
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
@@ -3492,13 +3576,14 @@ msgid "Home"
 msgstr "Имя системы"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
 #: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:722
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/fai/class_faiManagement.inc:650
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
@@ -3508,19 +3593,21 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:316
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:455
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:650
@@ -3543,12 +3630,13 @@ msgid "New Blocklist"
 msgstr "\"Черные списки\""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
 #: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:739
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/admin/fai/class_faiManagement.inc:680
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
@@ -3558,28 +3646,31 @@ msgid "Submit department"
 msgstr "Показать подразделения"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiManagement.inc:698
 #: plugins/admin/fai/class_faiManagement.inc:798
 #: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 #, fuzzy
@@ -3587,8 +3678,8 @@ msgid "edit"
 msgstr "Изменить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #, fuzzy
 msgid "Edit user"
@@ -3596,20 +3687,22 @@ msgstr "Пользователи домена"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiManagement.inc:699
 #: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_faiHook.inc:256
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
@@ -3618,8 +3711,8 @@ msgid "delete"
 msgstr "Удалить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #, fuzzy
 msgid "Delete user"
@@ -3632,13 +3725,14 @@ msgstr "Управление \"черными списками\""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
 #: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/admin/fai/class_faiManagement.inc:695
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:350
@@ -3860,7 +3954,7 @@ msgstr "Вы пытаетесь ввести некорректный номер
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:616
+#: plugins/admin/groups/class_groupApplication.inc:641
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
@@ -3935,7 +4029,7 @@ msgstr "Поиск"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
+#: plugins/admin/systems/class_printGeneric.inc:746
 #: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4111,7 +4205,7 @@ msgid "Add entry"
 msgstr "Добавить объект"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Редактиовать объект"
 
@@ -4914,72 +5008,72 @@ msgstr "Управление группами"
 msgid "Groups"
 msgstr "Группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
 #: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
+#: include/class_CopyPasteHandler.inc:216
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
 #: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
+#: include/class_CopyPasteHandler.inc:218
 #, fuzzy
 msgid "Can't paste"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/groups/class_groupManagement.inc:464
+#: plugins/admin/groups/class_groupManagement.inc:416
 #, fuzzy
 msgid "Create new group"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
 #: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
 #: plugins/admin/ogroups/class_ogroupManagement.inc:471
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
 #: plugins/admin/departments/class_departmentManagement.inc:314
 #: plugins/admin/ogroups/class_ogroupManagement.inc:473
 #: plugins/admin/ogroups/class_ogroupManagement.inc:478
@@ -4988,10 +5082,10 @@ msgstr "Редактиовать объект"
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:315
 #: plugins/admin/ogroups/class_ogroupManagement.inc:475
 #: plugins/admin/ogroups/class_ogroupManagement.inc:480
@@ -5001,27 +5095,27 @@ msgstr "Редактиовать объект"
 msgid "Delete this entry"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 #, fuzzy
 msgid "Posix"
 msgstr "Прокси-сервер"
 
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
 #: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Приложение"
 
-#: plugins/admin/groups/class_groupManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:474
 #, fuzzy
 msgid "Groupname"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -5031,68 +5125,68 @@ msgstr "Группа"
 msgid "Properties"
 msgstr "Свойства"
 
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
 #: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:176
 msgid "This 'dn' is no group."
 msgstr "Это DN соответствует не группе."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:316
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:322
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:433
+#, fuzzy
+msgid "! unknown id"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, fuzzy
-msgid "! unknown id"
-msgstr "состояние неизвестно"
-
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:601
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:606
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "У вас недостаточно прав для создания группы в этой ветке."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:730
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -5100,9 +5194,9 @@ msgstr ""
 "Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
 "буквы в нижнем регистре, цифры и дефисы."
 
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
 #: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
 msgid "Value specified as 'Name' is already used."
 msgstr "Группа с таким именем уже существует."
 
@@ -5131,7 +5225,7 @@ msgstr "Доступные приложения"
 
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Объект"
 
@@ -5260,6 +5354,7 @@ msgstr "Выбрать пользователей для добавления"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Выберите, чтобы просмотреть серверы"
@@ -5299,15 +5394,15 @@ msgstr "Показать адреса подразделения"
 msgid "Display addresses matching"
 msgstr "Показать подходяшие адреса"
 
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Удалить приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5315,11 +5410,11 @@ msgstr ""
 "Этой группе доступны приложения. Вы можете запретить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Создать приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5327,79 +5422,79 @@ msgstr ""
 "Этой группе недоступны приложения. Вы можете разрешить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Выбранное имя приложения не уникально. Проверьте свою базу данных LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
+#: plugins/admin/groups/class_groupApplication.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:338
 #: plugins/admin/fai/class_faiManagement.inc:719
 #, fuzzy
 msgid "department"
 msgstr "подразделения"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:655
 #, fuzzy
 msgid "application"
 msgstr "приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 #, fuzzy
 msgid "Delete entry"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupApplication.inc:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 #, fuzzy
 msgid "Move down"
 msgstr "Домен"
 
-#: plugins/admin/groups/class_groupApplication.inc:693
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:746
 #, fuzzy
 msgid "This application is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: plugins/admin/groups/class_groupApplication.inc:749
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:728
+#: plugins/admin/groups/class_groupApplication.inc:753
 #, fuzzy
 msgid "Check parameter"
 msgstr "Изменить параметры"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:755
 #, fuzzy
 msgid "This application has changed parameters."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:928
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -5506,58 +5601,58 @@ msgstr ""
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Вы собираетесь удалить пользователя %s."
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "Create new user"
 msgstr "Создание нового объекта в"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "New user"
 msgstr "пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 #, fuzzy
 msgid "Create new template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 #, fuzzy
 msgid "password"
 msgstr "Пароль"
 
-#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:729
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -5566,65 +5661,70 @@ msgstr "Пароль"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:805
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:835
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_userManagement.inc:764
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_userManagement.inc:768
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_userManagement.inc:770
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_userManagement.inc:774
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_userManagement.inc:776
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Изменить свойства"
+
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Create user from template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:780
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_userManagement.inc:838
 #, fuzzy
 msgid "Online"
 msgstr "в сети"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_userManagement.inc:845
 #, fuzzy
 msgid "Offline"
 msgstr "не в сети"
@@ -5645,12 +5745,13 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Template"
 msgstr "Шаблон"
 
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:334
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/fai/class_faiManagement.inc:445
 #: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageNew.tpl:44
@@ -5707,7 +5808,7 @@ msgstr "Регулярное выражение, соответствующее
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Приложение"
 
@@ -5724,8 +5825,8 @@ msgstr ""
 "пиктограммами)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/terminal.tpl:120 plugins/admin/systems/server.tpl:55
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
@@ -5876,23 +5977,23 @@ msgstr "Приложение с таким именем уже существу
 msgid "Application settings"
 msgstr "Параметры приложения"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationManagement.inc:349
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
 msgid "You are not allowed to delete this application!"
 msgstr "У вас недостаточно прав для удаления этого приложения!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #: plugins/admin/ogroups/class_ogroupManagement.inc:457
 #, fuzzy
 msgid "new"
 msgstr "Создать"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:450
 #, fuzzy
 msgid "Create new application"
 msgstr "Создать приложения"
@@ -6142,9 +6243,9 @@ msgstr "присутствует"
 #: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:180
 #: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_workstationService.inc:150
 msgid "This 'dn' has no terminal features."
 msgstr "Это DN не соответствует терминалу."
 
@@ -6190,32 +6291,32 @@ msgstr "Сервисы"
 msgid "LDAP Service"
 msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 #, fuzzy
 msgid "Terminal Service"
 msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
 #, fuzzy
 msgid "Temporary disable login"
 msgstr "Временно отключить использование факса"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
 #, fuzzy
 msgid "Font path"
 msgstr "Контакт"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
 #, fuzzy
 msgid "Syslog Service"
 msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
 #, fuzzy
 msgid "Print Service"
 msgstr "Служба печати"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
@@ -6332,12 +6433,12 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:606
 #: plugins/admin/systems/class_componentGeneric.inc:155
 #: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "В выбранной вами ветке уже есть запись \"%s\""
@@ -6346,129 +6447,134 @@ msgstr "В выбранной вами ветке уже есть запись \
 msgid "System management"
 msgstr "Управление системами"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Терминал"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Выберите ветку терминала"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/terminal.tpl:29 plugins/admin/systems/server.tpl:27
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Режим"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:31 plugins/admin/systems/server.tpl:29
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Выберите режим терминала"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Выберите сервер для ведения системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:54
 msgid "Root server"
 msgstr "Основной сервер"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:56
 msgid "Select NFS root filesystem to use"
 msgstr "Выберите корневую файловую систему NFS"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:62
 msgid "Swap server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:64
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Выберите файловую систему NFS для файлов подкачки"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Выберите сервер для ведения системных журналов"
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
 msgid "NTP server"
 msgstr "Сервер NTP"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
 msgid "Choose server to use for synchronizing time"
 msgstr "Выберите сервер для синхронизации времени"
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:45
+#: plugins/admin/systems/workstation.tpl:89
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Действие"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
 msgid "Select action to execute for this terminal"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_workstationService.inc:88
 msgid "default"
 msgstr "по умолчанию"
 
 #: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:89
 msgid "show chooser"
 msgstr "показать окно входа в систему"
 
 #: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:90
 msgid "direct"
 msgstr "напрямую"
 
 #: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_workstationService.inc:93
 msgid "load balanced"
 msgstr "с выравниваем нагрузки"
 
 #: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:96
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_workstationService.inc:97
 msgid "ICA client"
 msgstr "Клиент ICA"
 
 #: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:200
 #, fuzzy
 msgid "Choose the phone located at the current terminal"
 msgstr "Выбрать раздел, для хранения объекта"
 
 #: plugins/admin/systems/class_terminalService.inc:271
 #: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
 msgid "Please specify a valid VSync range."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
 #: plugins/admin/systems/class_terminalService.inc:286
 #: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
@@ -6485,7 +6591,7 @@ msgstr ""
 msgid "Server name"
 msgstr "Имя сервера"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:49
 #, fuzzy
 msgid "Select action to execute for this server"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
@@ -6494,15 +6600,15 @@ msgstr "Выберите действие, которое нужно выпол
 msgid "Phone name"
 msgstr "Название"
 
-#: plugins/admin/systems/class_servService.inc:273
+#: plugins/admin/systems/class_servService.inc:318
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
 msgid "Workstation name"
 msgstr "Имя рабочий станции"
 
@@ -6564,27 +6670,27 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid "Admins"
 msgstr "DN администратора"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 msgid "text"
 msgstr "текст"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:89
 msgid "graphic"
 msgstr "графика"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:70
 #: plugins/admin/ogroups/class_termgroup.inc:64
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -6592,58 +6698,110 @@ msgstr "Определение WAKECMD в вашем файле gosa.conf не 
 msgid "Execution of '%s' failed!"
 msgstr "Ошибка при выполнении \"%s\"!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/systems/class_servGeneric.inc:82
 #: plugins/admin/ogroups/class_termgroup.inc:76
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/systems/class_servGeneric.inc:94
 #: plugins/admin/ogroups/class_termgroup.inc:88
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Выключить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:321
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "У вас недостаточно прав для создания терминала в этой ветке."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:325
 msgid "The required field 'Terminal name' is not set."
 msgstr "Обязательное поле 'Название терминала' не заполнено."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
+#, fuzzy
+msgid "Activated"
+msgstr "Личный"
+
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+#, fuzzy
+msgid "Memory test"
+msgstr "Память"
+
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+#, fuzzy
+msgid "System analysis"
+msgstr "Системные журналы"
+
+#: plugins/admin/systems/class_servGeneric.inc:60
 #, fuzzy
 msgid "This 'dn' has no server features."
 msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
+#, fuzzy
+msgid "Instant update"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
+#, fuzzy
+msgid "Scheduled update"
+msgstr "Выберите режим терминала"
+
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
+#, fuzzy
+msgid "Rescan hardware"
+msgstr "Телефонное оборудование"
+
+#: plugins/admin/systems/class_servGeneric.inc:207
 #, fuzzy
 msgid "The required field 'Server name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_servGeneric.inc:214
 #, fuzzy
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
@@ -6674,56 +6832,20 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-#, fuzzy
-msgid "Activated"
-msgstr "Личный"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-#, fuzzy
-msgid "Memory test"
-msgstr "Память"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-#, fuzzy
-msgid "System analysis"
-msgstr "Системные журналы"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:120
 #, fuzzy
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:134
 msgid "This 'dn' has no workstation features."
 msgstr "Это DN не содержит атрибутоов рабочей станции."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#, fuzzy
-msgid "Instant update"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-#, fuzzy
-msgid "Scheduled update"
-msgstr "Выберите режим терминала"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Телефонное оборудование"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_workstationGeneric.inc:276
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 msgid "The required field 'Workstation name' is not set."
 msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
 
@@ -6731,199 +6853,223 @@ msgstr "Обязательное поле 'Название рабочей ст
 msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr "У вас недостаточно прав для смены пароля этой системы!"
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, fuzzy, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/systems/class_systemManagement.inc:538
-#: plugins/admin/systems/class_systemManagement.inc:609
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 #: plugins/admin/fai/class_faiManagement.inc:234
 #: plugins/admin/fai/class_faiManagement.inc:272
 #, fuzzy
 msgid "You are not allowed to delete this component!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal template"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation template"
 msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 #, fuzzy
 msgid "New Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 #, fuzzy
 msgid "New Printer"
 msgstr "Принтер"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 #, fuzzy
 msgid "New Phone"
 msgstr "Телефон"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 #, fuzzy
 msgid "New Component"
 msgstr "Прочие сетевые компоненты"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 #, fuzzy
 msgid "Edit system"
 msgstr "Список систем"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #, fuzzy
 msgid "Delete system"
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_systemManagement.inc:752
 #: plugins/admin/fai/class_faiManagement.inc:689
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "System"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
 #, fuzzy
 msgid "Cups Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
 #, fuzzy
 msgid "Mail Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:840
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
 #, fuzzy
 msgid "Imap Server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:843
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:844
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
 #, fuzzy
 msgid "Fax Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:845
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_systemManagement.inc:878
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
 msgid "Set root password"
 msgstr "Изменить пароль"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:882
 #, fuzzy
 msgid "New System from incoming"
 msgstr "Системная информация"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:884
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:598
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
 
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: plugins/admin/systems/class_systemManagement.inc:885
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:597
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:888
 #, fuzzy
 msgid "Winstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:889
 #, fuzzy
 msgid "Network Device"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
+#: plugins/admin/systems/class_systemManagement.inc:1111
 msgid "New terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
+#: plugins/admin/systems/class_systemManagement.inc:1113
 msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/class_systemManagement.inc:1115
 #, fuzzy
 msgid "New Device"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/class_systemManagement.inc:1130
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_systemManagement.inc:1184
+#: plugins/admin/systems/class_systemManagement.inc:1142
 msgid "Workstation template for"
 msgstr "Шаблон рабочей станции для"
 
@@ -7175,10 +7321,13 @@ msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
 msgid "List of systems"
 msgstr "Список систем"
 
 #: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 #, fuzzy
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
@@ -7189,61 +7338,74 @@ msgstr ""
 "были запущены."
 
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Показать серверы"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #, fuzzy
 msgid "Select to see Linux terminals"
 msgstr "Выберите чтобы посмотреть терминалы"
 
 #: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Показать терминалы"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #, fuzzy
 msgid "Select to see Linux workstations"
 msgstr "Выберите чтобы посмотреть рабочие станции"
 
 #: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Показать рабочие станции"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Посмотреть рабочие станции с MicroSoft Windows"
 
 #: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Show windows based workstations"
 msgstr "Показать рабочие станции с windows"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see network printers"
 msgstr "Выберите чтобы посмотреть сетевые принтеры"
 
 #: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Show network printers"
 msgstr "Показать сетевые принтеры"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see VOIP phones"
 msgstr "Выберите чтобы посмотреть VOIP телефоны"
 
 #: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Показать телефоны"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 #, fuzzy
 msgid "Select to see network devices"
 msgstr "Выберите чтобы посмотреть сетевые принтеры"
 
 #: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
 #, fuzzy
 msgid "Show network devices"
 msgstr "Сетевые устройства"
@@ -7253,6 +7415,7 @@ msgid "Regular expression for matching system names"
 msgstr "Регулярное выражение, соответствующее именам систем"
 
 #: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 #, fuzzy
 msgid "Display systems of user"
 msgstr "Показать адреса пользователя"
@@ -7333,6 +7496,119 @@ msgstr ""
 msgid "No SMTP privileged networks set."
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+#, fuzzy
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+#, fuzzy
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:298
+#, fuzzy
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
+#, fuzzy
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:473
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:481
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Системная информация"
+
+#: plugins/admin/systems/class_printGeneric.inc:494
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:496
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Группа"
+
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
 msgid ""
@@ -7481,16 +7757,16 @@ msgstr "Пользователи домена"
 msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:71
 #, fuzzy
 msgid "Codepage"
 msgstr "Домашняя страница"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:81
 #, fuzzy
 msgid "Option"
 msgstr "Параметры"
@@ -7601,42 +7877,42 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_servNfs.inc:45
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:48
 #, fuzzy
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:183
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
 msgid "Please specify a valid name for your setup."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:192
 #, fuzzy
 msgid "Please specify a name for your setup."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:197
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:201
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:205
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
@@ -8048,21 +8324,16 @@ msgid "Boot parameters"
 msgstr "Параметры загрузки"
 
 #: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-сервер"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
 #: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Ядро для загрузки"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Дополнительные параметры"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
@@ -8071,6 +8342,11 @@ msgstr ""
 "Введите любые дополнительные параметры, которые должны передаваться ядру во "
 "время загрузки"
 
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-сервер"
+
 #: plugins/admin/systems/workstationStartup.tpl:37
 #, fuzzy
 msgid "FAI server"
@@ -8334,7 +8610,6 @@ msgstr "Регулярное выражение, соответствующее
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #, fuzzy
@@ -9156,13 +9431,15 @@ msgstr "Каталог"
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -9171,12 +9448,13 @@ msgid "Choose a system type"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Описание группы"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Объект группы"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
@@ -9334,113 +9612,15 @@ msgstr ""
 msgid "To add a new host entry just click here"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:224
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
-
-#: plugins/admin/systems/class_printGeneric.inc:276
-#, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Удалить параметры"
-
-#: plugins/admin/systems/class_printGeneric.inc:284
-#, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-#, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:292
-#, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_divListSystem.inc:55
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
+msgid "System / Department"
+msgstr "Подразделение"
 
-#: plugins/admin/systems/class_printGeneric.inc:475
+#: plugins/admin/systems/class_divListSystem.inc:169
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Системная информация"
-
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Группа"
+msgid "Set root       password"
+msgstr "Изменить пароль"
 
 #: plugins/admin/ogroups/headpage.tpl:24
 #, fuzzy
@@ -9998,9 +10178,10 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr "Управление приложениями"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
 msgid "Download"
@@ -10508,11 +10689,6 @@ msgstr "Переменная"
 msgid "List of template files"
 msgstr "Список подразделений"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Выбрать раздел, для хранения объекта"
-
 #: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
 msgid "List of hook scripts"
@@ -11692,25 +11868,32 @@ msgstr "Невозможно отправить сценарий SIEVE. Отве
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Список пользователей"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:489
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:552
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "состояние неизвестно"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11719,19 +11902,19 @@ msgstr ""
 "Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
 "об этом команде разработчиков GOsa."
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:952
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -11743,21 +11926,21 @@ msgid ""
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:529
+#: include/class_plugin.inc:535
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:569 include/class_password-methods.inc:181
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/class_plugin.inc:585
+#: include/class_plugin.inc:603
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -12021,38 +12204,48 @@ msgstr "Поддержка Gofon отключена, не все схемы ус
 msgid "Support for nagios enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr "Поддержка Gofon отключена, не все схемы установлены!"
+
 #: include/functions_setup.inc:256
 #, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
+
+#: include/functions_setup.inc:266
+#, fuzzy
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Пропуск"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Ошибка"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Проверка версии PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -12060,11 +12253,11 @@ msgstr ""
 "У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
 "реализованы некоторые новые функции и исправлены некоторые ошибки."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Проверка значения параметра register_globals (должно быть: off)"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:319
 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 "
@@ -12074,47 +12267,47 @@ msgstr ""
 "переменные доступными из сценария без смены области действия. Это может быть "
 "нарушением безопасности. Тем не менее, GOsa будет работать в любом случае."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Проверка модуля ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Основной модуль, используемый GOsa, и поэтому обязательный."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:326
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Необходима для локализованных версий GOsa."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:334
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Проверка модуля mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -12123,11 +12316,11 @@ msgstr ""
 "используете только алгоритмы crypt или MD5, не обращайте внимания на "
 "результат проверки. GOsa будет работать и без этого модуля."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -12135,11 +12328,11 @@ msgstr ""
 "Этот модуль нужен для работы с сервером IMAP. С его помощью можно получать "
 "информацию о состоянии учетной записи, создавать и удалять пользователей."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Проверка использования getacl в IMAP"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -12149,21 +12342,21 @@ msgstr ""
 "Стандартный модуль IMAP не может обрабатывать acl. Для использования этой "
 "функции вам нужна последняя версия PHP."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Проверка модуля mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Необходим для чтения отчетов о полученных факсимильных сообщениях из базы "
 "данных."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Проверка модуля cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -12171,11 +12364,11 @@ msgstr ""
 "Чтобы получать информацию о доступных принтерах по протоколу IPP вместо "
 "чтения файлов printcap, вам нужно установить модуль CUPS."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Проверка модуля kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -12183,42 +12376,42 @@ msgstr ""
 "Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
 "который можно загрузить из сети PEAR."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Проверка дополнительных программ"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Проверка ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -12226,12 +12419,12 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:428
 #, fuzzy
 msgid "Checking imagick module for PHP"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 #, fuzzy
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
@@ -12240,11 +12433,11 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Проверка утилиты fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -12252,11 +12445,11 @@ msgstr ""
 "Эта программа используется, только если вы работате с бездисковыми "
 "терминалами."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Проверка возможности создания хэшей LM/NT для паролей"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -12264,71 +12457,71 @@ msgstr ""
 "Чтобы пользоваться Samba 2/3, вам нужно установить некоторые дополнительные "
 "программы для создания хэшей паролей."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
 msgstr ""
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Для продолжения укажите LDAP-сервер!"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -12336,8 +12529,8 @@ msgstr ""
 "Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
 "доступен GOsa."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 #, fuzzy
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
@@ -12346,13 +12539,13 @@ msgstr ""
 "Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
 "доступен GOsa."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
 msgstr ""
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12361,19 +12554,19 @@ msgstr ""
 "Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
 "целиком."
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:951
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -12435,7 +12628,7 @@ msgid ""
 "getting dns informations for this device."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:152
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Вы собираетесь удалить объект %s."
@@ -13161,9 +13354,9 @@ msgstr ""
 msgid "Operation complete"
 msgstr "не полный"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Готово"
+#, fuzzy
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Выбрать раздел, для хранения объекта"
 
 #~ msgid "You have no permissions to create a printer on this 'Base'."
 #~ msgstr "У вас недостаточно прав для создания принтера в этой ветке."
@@ -13348,9 +13541,6 @@ msgstr "Готово"
 #~ msgid "DNS-TTL"
 #~ msgstr "DNS"
 
-#~ msgid "Network settings"
-#~ msgstr "Сетевые настройки"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Выбрать"